Revert "Hotfix 0.9.40"

Catrobat · Aug 16, 2018 · 89fbf78 · 89fbf78
1 parent 5ce586e
commit 89fbf78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/catroid/build.gradle b/catroid/build.gradle
@@ -279,9 +279,9 @@ android {
         targetSdkVersion 22
         applicationId appId
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
-        versionCode 46
+        versionCode 45
         println "VersionCode is " + versionCode
-        versionName "0.9.40"
+        versionName "0.9.38"
         println "VersionName is " + versionName
         buildConfigField "String", "GIT_DESCRIBE", "\"${versionName}\""
         buildConfigField "String", "GIT_CURRENT_BRANCH", "\"${getCurrentGitBranch()}\""

diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java
@@ -26,7 +26,6 @@
 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;
@@ -159,16 +158,7 @@ private void cloneFormulaBrick(FormulaBrick formulaBrick) {
 	}
 
 	private static void showFragment(View view, FormulaBrick formulaBrick, Brick.BrickField brickField, boolean showCustomView) {
-
-		Context context = view.getContext();
-		while (context instanceof ContextWrapper) {
-			if (context instanceof Activity) {
-				break;
-			}
-			context = ((ContextWrapper) context).getBaseContext();
-		}
-
-		Activity activity = (Activity) context;
+		Activity activity = (Activity) view.getContext();
 
 		FormulaEditorFragment formulaEditorFragment = (FormulaEditorFragment) activity.getFragmentManager()
 				.findFragmentByTag(FORMULA_EDITOR_FRAGMENT_TAG);