Projects >> OfficeAide >>6701dc14b63735750bbcec2048044f3ced6e12d5

Chunk
Conflicting content
			Intent i = new Intent(this, SettingActivity.class);
			startActivity(i);
		} else {
<<<<<<< HEAD
			//
			DisplayMetrics metrics = new DisplayMetrics();
			getWindowManager().getDefaultDisplay().getMetrics(metrics);
			Log.d("NOA", " metrics.densityDpi :" + metrics.densityDpi);
			Log.d("NOA", " metrics.density :" + metrics.density);
			Log.d("NOA", " metrics.scaledDensity :" + metrics.scaledDensity);
			//
			wvMain = (WebView) findViewById(R.id.webview);
			wvMain.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
			wvMain.setOnTouchListener(new View.OnTouchListener() {

				public boolean onTouch(View v, MotionEvent event) {
					return (event.getAction() == MotionEvent.ACTION_MOVE && isFrozen());
				}
			});
			wvMain.setWebViewClient(new WebViewClient() {
				@Override
				public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) {
					Log.d("NOA", "onReceivedHttpAuthRequest - host:" + host + ",realm:" + realm);
					final String pw = UserData.RegisterInfo.pw.value();
					handler.proceed(username, pw);
				}
			});
			wvMain.setWebChromeClient(new WebChromeClient() {
				@Override
				public void onConsoleMessage(String message, int lineNumber, String sourceID) {
					Log.d("NOA", message + " - From line " + lineNumber + " of " + sourceID);
				}
			});
			WebSettings webSettings = wvMain.getSettings();
			webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
			webSettings.setJavaScriptEnabled(true);
			wvMain.setFocusable(true);
			wvMain.setFocusableInTouchMode(true);
			webSettings.setNeedInitialFocus(true);
			wvMain.addJavascriptInterface(new BaseJS(this), "OA_Base");
			wvMain.addJavascriptInterface(new CommJS(this), "OA_Comm");
			wvMain.loadUrl("http://" + UserData.AppConfig.SERVICE_ADDRESS.value() + "/m/index.php");
=======
			if (!loaded) {
				wvMain.loadUrl("http://" + UserData.AppConfig.SERVICE_ADDRESS.value() + "/m/index.php");
				this.loaded = true;
			}
>>>>>>> 741c213f50944898e5de1b96fb417707cedfb7d2
		}
	}
Solution content
			Intent i = new Intent(this, SettingActivity.class);
			startActivity(i);
		} else {
			//
			if (!loaded) {
				wvMain.loadUrl("http://" + UserData.AppConfig.SERVICE_ADDRESS.value() + "/m/index.php");
				loaded = true;
			}
		}
	}
File
MainActivity.java
Developer's decision
Manual
Kind of conflict
Attribute
Cast expression
Comment
If statement
Method invocation
Variable