github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed CB-11078 Empty string for BackgroundColor preference crashes application

Browse Source 
This closes #316
This commit is contained in:
akilawickey 2016-07-13 03:46:57 +05:30 committed by Jesse MacFadyen
parent 74ae6651c8
commit d54a42f0f0
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
framework/src/org/apache/cordova/CordovaActivity.java
View File

@ -175,9 +175,14 @@ public class CordovaActivity extends Activity {
setContentView(appView.getView()); setContentView(appView.getView());
if (preferences.contains("BackgroundColor")) { if (preferences.contains("BackgroundColor")) {
int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK); try {
// Background of activity: int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
appView.getView().setBackgroundColor(backgroundColor); // Background of activity:
appView.getView().setBackgroundColor(backgroundColor);
}
catch (NumberFormatException e){
e.printStackTrace();
}
} }
appView.getView().requestFocusFromTouch(); appView.getView().requestFocusFromTouch();

3
test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
View File

@ -42,4 +42,7 @@ public class CordovaActivityTest extends BaseCordovaIntegrationTest {
String onPageFinishedUrl = testActivity.onPageFinishedUrl.take(); String onPageFinishedUrl = testActivity.onPageFinishedUrl.take();
assertEquals(MainTestActivity.START_URL, onPageFinishedUrl); assertEquals(MainTestActivity.START_URL, onPageFinishedUrl);
} }
protected void createViews() {
assertTrue(testView instanceof SystemWebView);
}
} }

1
test/res/xml/config.xml
View File

@ -35,6 +35,7 @@
<preference name="useBrowserHistory" value="true" /> <preference name="useBrowserHistory" value="true" />
<preference name="exit-on-suspend" value="false" /> <preference name="exit-on-suspend" value="false" />
<preference name="showTitle" value="true" /> <preference name="showTitle" value="true" />
<preference name="BackgroundColor" value="" />
<feature name="Activity"> <feature name="Activity">
<param name="android-package" value="org.apache.cordova.test.ActivityPlugin" /> <param name="android-package" value="org.apache.cordova.test.ActivityPlugin" />
</feature> </feature>