Fix #10093: remove the configureView() in ThemeWebActivity and preven…

…t overriding
wordpress-mobile · Jun 24, 2019 · 96deb63 · 96deb63
1 parent 47f36b2
commit 96deb63
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 28 deletions.
diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
@@ -339,6 +339,7 @@
         <activity
             android:name=".ui.themes.ThemeWebActivity"
             android:label="@string/selected_theme"
+            android:theme="@style/Calypso.NoActionBar"
             android:parentActivityName=".ui.themes.ThemeBrowserActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java
@@ -115,7 +115,7 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public void configureView() {
+    public final void configureView() {
         setContentView(R.layout.wpwebview_activity);
 
         mActionableEmptyView = findViewById(R.id.actionable_empty_view);

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeWebActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeWebActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -38,6 +39,11 @@ enum ThemeWebActivityType {
         SUPPORT
     }
 
+    @Override public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setActionBarTitleToThemeName();
+    }
+
     public static String getSiteLoginUrl(SiteModel site) {
         if (site.isJetpackConnected()) {
             return WPCOM_LOGIN_URL;
@@ -149,12 +155,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void configureView() {
-        setContentView(R.layout.theme_web_activity);
-        setActionBarTitleToThemeName();
-    }
-
     private void setActionBarTitleToThemeName() {
         String themeName = getIntent().getStringExtra(THEME_NAME);
         if (getSupportActionBar() != null && themeName != null) {

diff --git a/WordPress/src/main/res/layout/theme_web_activity.xml b/WordPress/src/main/res/layout/theme_web_activity.xml