From 007b390c42a0a898600ff921c0b587296162bcf5 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 10 Aug 2014 11:32:46 -0700
Subject: [PATCH] fix crash downloading updates: requestWindowFeature() must be
 called earlier, from activity's onCreate

---
 .../src/org/eehouse/android/xw4/BoardActivity.java        | 8 ++++++++
 .../src/org/eehouse/android/xw4/BoardDelegate.java        | 5 -----
 .../XWords4/src/org/eehouse/android/xw4/DelegateBase.java | 5 -----
 .../src/org/eehouse/android/xw4/DwnldActivity.java        | 4 ++++
 .../src/org/eehouse/android/xw4/DwnldDelegate.java        | 4 ----
 .../src/org/eehouse/android/xw4/InviteActivity.java       | 2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index 76bd5a90b..4231d73f1 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -25,6 +25,9 @@ import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.KeyEvent;
+import android.view.Window;
+
+import org.eehouse.android.xw4.jni.CommonPrefs;
 
 public class BoardActivity extends XWActivity {
 
@@ -33,6 +36,11 @@ public class BoardActivity extends XWActivity {
     @Override
     protected void onCreate( Bundle savedInstanceState ) 
     {
+        if ( CommonPrefs.getHideTitleBar( this )
+             && ABUtils.haveMenuKey( this ) ) {
+            requestWindowFeature( Window.FEATURE_NO_TITLE );
+        }
+        
         m_dlgt = new BoardDelegate( this, savedInstanceState );
         super.onCreate( savedInstanceState, m_dlgt );
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
index 1bd223c5a..d1965ed56 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
@@ -504,11 +504,6 @@ public class BoardDelegate extends DelegateBase
     {
         getBundledData( savedInstanceState );
 
-        if ( CommonPrefs.getHideTitleBar( m_activity )
-             && ABUtils.haveMenuKey( m_activity ) ) {
-            requestWindowFeature( Window.FEATURE_NO_TITLE );
-        }
-
         if ( BuildConstants.CHAT_SUPPORTED ) {
             m_pendingChats = new ArrayList<String>();
         }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
index 843e93ec3..52695a146 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
@@ -208,11 +208,6 @@ public class DelegateBase implements DlgDelegate.DlgClickNotify,
         Utils.showToast( m_activity, msg );
     }
 
-    public boolean requestWindowFeature( int feature )
-    {
-        return m_activity.requestWindowFeature( feature );
-    }
-
     public Object getSystemService( String name )
     {
         return m_activity.getSystemService( name );
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java
index 0e5d9769e..aa184b294 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldActivity.java
@@ -22,14 +22,18 @@ package org.eehouse.android.xw4;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.Window;
 
 public class DwnldActivity extends XWListActivity {
 
     @Override
     protected void onCreate( Bundle savedInstanceState ) 
     {
+        requestWindowFeature( Window.FEATURE_NO_TITLE );
+
         DwnldDelegate dlgt = 
             new DwnldDelegate( this, savedInstanceState );
+
         super.onCreate( savedInstanceState, dlgt );
     }
 }
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
index d71a06b3f..c41c3b223 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
@@ -243,10 +243,6 @@ public class DwnldDelegate extends ListDelegateBase {
         String[] urls = null;
         LinearLayout item = null;
 
-        requestWindowFeature( Window.FEATURE_LEFT_ICON );
-        m_activity.getWindow().setFeatureDrawableResource( Window.FEATURE_LEFT_ICON,
-                                                           R.drawable.icon48x48 );
-
         Intent intent = getIntent();
         Uri uri = intent.getData(); // launched from Manifest case
         if ( null == uri ) {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteActivity.java
index 58ff97799..9b1adf622 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteActivity.java
@@ -24,7 +24,7 @@ import android.app.ListActivity;
 import android.os.Bundle;
 import android.view.Window;
 
-public class InviteActivity extends XWListActivity {
+public abstract class InviteActivity extends XWListActivity {
 
     @Override
     protected void onCreate( Bundle savedInstanceState )