Merge pull request #98 from geeeeeeeeek/release/2.1

Hotfix crash in APK level lower than lollipop.
geeeeeeeeek · Jan 30, 2016 · 1d7d101 · 1d7d101
2 parents 10a1fde + 51b95f6
commit 1d7d101
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/app/src/main/java/xyz/monkeytong/hongbao/activities/MainActivity.java b/app/src/main/java/xyz/monkeytong/hongbao/activities/MainActivity.java
@@ -18,6 +18,7 @@
 import xyz.monkeytong.hongbao.utils.ConnectivityUtil;
 import xyz.monkeytong.hongbao.utils.UpdateTask;
 
+import java.lang.reflect.Method;
 import java.util.List;
 
 import im.fir.sdk.FIR;
@@ -52,17 +53,17 @@ private void explicitlyLoadPreferences() {
  */
  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
  private void handleMaterialStatusBar() {
- try {
-  Window window = this.getWindow();
+ // Not supported in APK level lower than 21
+ if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
 
-  window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ Window window = this.getWindow();
 
- window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+ window.setStatusBarColor(0xffd84e43);
 
- window.setStatusBarColor(0xffd84e43);
- } catch (Exception e) {
- // Guai wo lo
- }
  }
 
  @Override

diff --git a/app/src/main/java/xyz/monkeytong/hongbao/activities/SettingsActivity.java b/app/src/main/java/xyz/monkeytong/hongbao/activities/SettingsActivity.java
@@ -71,17 +71,16 @@ private void loadUI() {
  setContentView(R.layout.activity_preferences);
  addPreferencesFromResource(R.xml.preferences);
 
- try {
- Window window = this.getWindow();
+ if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
 
-  window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ Window window = this.getWindow();
 
- window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+ window.setStatusBarColor(0xffd84e43);
 
- window.setStatusBarColor(0xffd84e43);
- } catch (Exception e) {
- // Guai wo lo
- }
  }
 
  @Override

diff --git a/app/src/main/java/xyz/monkeytong/hongbao/activities/WebViewActivity.java b/app/src/main/java/xyz/monkeytong/hongbao/activities/WebViewActivity.java
@@ -68,17 +68,16 @@ public void onPageFinished(WebView view, String url) {
  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
  private void loadUI() {
  setContentView(R.layout.activity_webview);
- try {
- Window window = this.getWindow();
 
-  window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
 
-  window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ Window window = this.getWindow();
 
- window.setStatusBarColor(0xffd84e43);
- } catch (Exception e) {
- // Guai wo lo
- }
+ window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+
+ window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+
+ window.setStatusBarColor(0xffd84e43);
  }
 
  @Override