Revision 9276dced
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/objectlib/helpers/BlockController.java | ||
|---|---|---|
| 21 | 21 |
|
| 22 | 22 |
import com.google.firebase.crashlytics.FirebaseCrashlytics; |
| 23 | 23 |
|
| 24 |
import java.lang.ref.WeakReference; |
|
| 25 | 24 |
import java.util.Timer; |
| 26 | 25 |
import java.util.TimerTask; |
| 27 | 26 |
|
| ... | ... | |
| 52 | 51 |
private long mTouchBlockTime, mUIBlockTime; |
| 53 | 52 |
private int mLastTouchPlace, mLastUIPlace; |
| 54 | 53 |
|
| 55 |
private final WeakReference<TwistyActivity> mAct;
|
|
| 54 |
private final ObjectPreRender mPre;
|
|
| 56 | 55 |
|
| 57 | 56 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 58 | 57 |
|
| ... | ... | |
| 70 | 69 |
|
| 71 | 70 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 72 | 71 |
|
| 73 |
public BlockController(TwistyActivity act) |
|
| 72 |
public BlockController(TwistyActivity act, ObjectPreRender pre)
|
|
| 74 | 73 |
{
|
| 75 |
mAct = new WeakReference<>(act);
|
|
| 74 |
mPre = pre;
|
|
| 76 | 75 |
|
| 77 | 76 |
Timer timer = new Timer(); |
| 78 | 77 |
|
| ... | ... | |
| 129 | 128 |
} |
| 130 | 129 |
else |
| 131 | 130 |
{
|
| 132 |
TwistyActivity act = mAct.get(); |
|
| 133 |
boolean reallyBlocked = true; |
|
| 134 |
|
|
| 135 |
if( act!=null ) |
|
| 136 |
{
|
|
| 137 |
ObjectPreRender pre = act.getPreRender(); |
|
| 138 |
if( pre!=null ) |
|
| 139 |
{
|
|
| 140 |
reallyBlocked = pre.isTouchBlocked(); |
|
| 141 |
pre.unblockTouch(); |
|
| 142 |
} |
|
| 143 |
} |
|
| 144 |
|
|
| 131 |
boolean reallyBlocked = mPre.isTouchBlocked(); |
|
| 132 |
mPre.unblockTouch(); |
|
| 145 | 133 |
reportTouchProblem(touchBlocked, reallyBlocked); |
| 146 | 134 |
} |
| 147 | 135 |
} |
| ... | ... | |
| 160 | 148 |
} |
| 161 | 149 |
else |
| 162 | 150 |
{
|
| 163 |
TwistyActivity act = mAct.get(); |
|
| 164 |
boolean reallyBlocked = true; |
|
| 165 |
|
|
| 166 |
if( act!=null ) |
|
| 167 |
{
|
|
| 168 |
ObjectPreRender pre = act.getPreRender(); |
|
| 169 |
if( pre!=null ) |
|
| 170 |
{
|
|
| 171 |
reallyBlocked = !pre.isUINotBlocked(); |
|
| 172 |
pre.unblockUI(); |
|
| 173 |
} |
|
| 174 |
} |
|
| 175 |
|
|
| 151 |
boolean reallyBlocked = !mPre.isUINotBlocked(); |
|
| 152 |
mPre.unblockUI(); |
|
| 176 | 153 |
reportUIProblem(uiBlocked, reallyBlocked); |
| 177 | 154 |
} |
| 178 | 155 |
} |
Also available in: Unified diff
Move RubikControl to objectlib (as 'ObjectAutomator')
Hide ObjectPreRender inside objectlib and move its APi to ObjectControl.