### v 6.6

pawel8282 · Aug 2, 2019 · 602ca45 · 602ca45
1 parent 21e3ca7
commit 602ca45
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
  applicationId "de.baumann.browser"
  minSdkVersion 21
  targetSdkVersion 28
- versionCode 97
- versionName "6.6"
+ versionCode 98
+ versionName "6.6.1"
  multiDexEnabled true
  vectorDrawables.useSupportLibrary = true
  }

diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":97,"versionName":"6.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":98,"versionName":"6.6.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/de/baumann/browser/Activity/BrowserActivity.java b/app/src/main/java/de/baumann/browser/Activity/BrowserActivity.java
@@ -654,10 +654,7 @@ public synchronized void showAlbum(AlbumController controller) {
  currentAlbumController = controller;
  currentAlbumController.activate();
  activity_main.setBackgroundColor(getResources().getColor(R.color.color_light));
- if (ninjaWebView == currentAlbumController) {
- omniboxTitle.setText(currentAlbumController.getAlbumTitle());
- setColor();
- }
+ updateOmnibox();
  }
 
  @Override
@@ -2326,6 +2323,7 @@ public void run() {
 
  private synchronized void updateAlbum(String url) {
  ((NinjaWebView) currentAlbumController).loadUrl(url);
+ updateOmnibox();
  }
 
  private void closeTabConfirmation(final Runnable okAction) {
@@ -2383,6 +2381,16 @@ public void run() {
  }
  }
 
+ private void updateOmnibox() {
+ if (ninjaWebView == currentAlbumController) {
+ omniboxTitle.setText(currentAlbumController.getAlbumTitle());
+ setColor();
+ } else {
+ ninjaWebView = (NinjaWebView) currentAlbumController;
+ updateProgress(ninjaWebView.getProgress());
+ }
+ }
+
  private void scrollChange () {
 
  if (Objects.requireNonNull(sp.getString("sp_hideToolbar", "0")).equals("0") ||