OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 14:35:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed broken photo viewer after main activity destroy

Browse source
This commit is contained in:
DrKLO 2014-07-12 02:14:13 +04:00
parent fa1734518d
commit 780ca63d8d
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/build.gradle
View file

@ -83,7 +83,7 @@ android {
defaultConfig {
minSdkVersion 8
targetSdkVersion 19
versionCode 274
versionCode 275
versionName "1.6.0"
}
}

1
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file

@ -500,6 +500,7 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
@Override
protected void onDestroy() {
PhotoViewer.getInstance().destroyPhotoViewer();
super.onDestroy();
onFinish();
}

16
TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
View file

@ -1697,6 +1697,22 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
}
public void destroyPhotoViewer() {
if (parentActivity == null || windowView == null) {
return;
}
try {
WindowManager wm = (WindowManager) parentActivity.getSystemService(Context.WINDOW_SERVICE);
if (windowView.getParent() != null) {
wm.removeViewImmediate(windowView);
}
windowView = null;
} catch (Exception e) {
FileLog.e("tmessages", e);
}
Instance = null;
}
private void onPhotoClosed(PlaceProviderObject object) {
disableShowCheck = true;
currentMessageObject = null;