Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix 0.9.40 #2939

Merged
merged 4 commits into from
Aug 15, 2018
Merged

Hotfix 0.9.40 #2939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4a657d
HOTFIX-0.9.40 - increas version code and version name
84n4n4 Aug 14, 2018
ac9037c
Merge pull request #2937 from 84n4n4/hotfix-0.9.40-versioncodeandname
84n4n4 Aug 14, 2018
9cc9332
HOTFIX - Fromula brick field crashes on API 19 and below
84n4n4 Aug 14, 2018
fb819cd
Merge pull request #2936 from 84n4n4/HOTFIX-FormulaFieldCrashesInApi19
84n4n4 Aug 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions catroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@ android {
targetSdkVersion 22
applicationId appId
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
versionCode 45
versionCode 46
println "VersionCode is " + versionCode
versionName "0.9.38"
versionName "0.9.40"
println "VersionName is " + versionName
buildConfigField "String", "GIT_DESCRIBE", "\"${versionName}\""
buildConfigField "String", "GIT_CURRENT_BRANCH", "\"${getCurrentGitBranch()}\""
Expand Down
12 changes: 11 additions & 1 deletion catroid/src/main/java/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import android.app.Fragment;
import android.app.FragmentManager;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
Expand Down Expand Up @@ -158,7 +159,16 @@ private void cloneFormulaBrick(FormulaBrick formulaBrick) {
}

private static void showFragment(View view, FormulaBrick formulaBrick, Brick.BrickField brickField, boolean showCustomView) {
Activity activity = (Activity) view.getContext();

Context context = view.getContext();
while (context instanceof ContextWrapper) {
if (context instanceof Activity) {
break;
}
context = ((ContextWrapper) context).getBaseContext();
}

Activity activity = (Activity) context;

FormulaEditorFragment formulaEditorFragment = (FormulaEditorFragment) activity.getFragmentManager()
.findFragmentByTag(FORMULA_EDITOR_FRAGMENT_TAG);
Expand Down