diff --git a/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml b/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml index 6f7e26783..6180a7b88 100644 --- a/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml +++ b/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml @@ -96,7 +96,8 @@ + android:authorities="com.freerdp.afreerdp.services.freerdpsuggestionprovider" + android:exported="false"> diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle index 585593658..a9ca4d1f4 100644 --- a/client/Android/Studio/freeRDPCore/build.gradle +++ b/client/Android/Studio/freeRDPCore/build.gradle @@ -18,7 +18,7 @@ android { ndk { File jniLibsDirectory = new File(project.projectDir, "src/main/jniLibs") - ArrayList abiFiltersList = new ArrayList(); + ArrayList abiFiltersList = new ArrayList() if (new File(jniLibsDirectory, "arm64-v8a/libfreerdp3.so").exists()) abiFiltersList.add("arm64-v8a") if (new File(jniLibsDirectory, "armeabi-v7a/libfreerdp3.so").exists()) diff --git a/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml b/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml index 5c52315ff..d2d5a1673 100644 --- a/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml +++ b/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml @@ -55,7 +55,7 @@ diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/GlobalApp.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/GlobalApp.java index 89aee2664..14b1156f4 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/GlobalApp.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/GlobalApp.java @@ -74,7 +74,7 @@ public class GlobalApp extends Application implements LibFreeRDP.EventListener { // start disconnect timeout... disconnectTimer = new Timer(); - disconnectTimer.schedule(new DisconnectTask(), timeoutMinutes * 60 * 1000); + disconnectTimer.schedule(new DisconnectTask(), (long)timeoutMinutes * 60 * 1000); } } @@ -148,7 +148,7 @@ public class GlobalApp extends Application implements LibFreeRDP.EventListener // http://thinkandroid.wordpress.com/2010/01/24/handling-screen-off-and-screen-on-intents/ IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON); filter.addAction(Intent.ACTION_SCREEN_OFF); - registerReceiver(new ScreenReceiver(), filter); + registerReceiver(new ScreenReceiver(), filter, RECEIVER_EXPORTED); } // helper to send FreeRDP notifications diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/NetworkStateReceiver.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/NetworkStateReceiver.java index ea3d663a7..ba3bbecf0 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/NetworkStateReceiver.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/NetworkStateReceiver.java @@ -17,6 +17,8 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.util.Log; +import androidx.annotation.NonNull; + public class NetworkStateReceiver extends BroadcastReceiver { @@ -34,8 +36,13 @@ public class NetworkStateReceiver extends BroadcastReceiver info.getType() != ConnectivityManager.TYPE_WIMAX); } - @Override public void onReceive(Context context, Intent intent) + @Override public void onReceive(@NonNull Context context, @NonNull Intent intent) { + String action = intent.getAction(); + if (!action.equals("android.net.conn.CONNECTIVITY_CHANGE")) + { + return; + } // check if we are connected via 3g or wlan if (intent.getExtras() != null) @@ -44,15 +51,18 @@ public class NetworkStateReceiver extends BroadcastReceiver (NetworkInfo)intent.getExtras().get(ConnectivityManager.EXTRA_NETWORK_INFO); // are we connected at all? - if (info != null && info.isConnected()) + if (info != null) { - // see if we are connected through 3G or WiFi - Log.d("app", "Connected via type " + info.getTypeName()); - GlobalApp.ConnectedTo3G = (info.getType() != ConnectivityManager.TYPE_WIFI && - info.getType() != ConnectivityManager.TYPE_WIMAX); - } + if (info.isConnected()) + { + // see if we are connected through 3G or WiFi + Log.d("app", "Connected via type " + info.getTypeName()); + GlobalApp.ConnectedTo3G = (info.getType() != ConnectivityManager.TYPE_WIFI && + info.getType() != ConnectivityManager.TYPE_WIMAX); + } - Log.v("NetworkState", info.toString()); + Log.v("NetworkState", info.toString()); + } } } } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/ScreenReceiver.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/ScreenReceiver.java index d1330caf2..58b788fa8 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/ScreenReceiver.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/ScreenReceiver.java @@ -25,6 +25,6 @@ public class ScreenReceiver extends BroadcastReceiver if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) app.startDisconnectTimer(); else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) - app.cancelDisconnectTimer(); + GlobalApp.cancelDisconnectTimer(); } } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/SessionState.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/SessionState.java index 1e1431c5a..3b039910b 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/SessionState.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/application/SessionState.java @@ -34,9 +34,9 @@ public class SessionState implements Parcelable return new SessionState[size]; } }; - private long instance; - private BookmarkBase bookmark; - private Uri openUri; + private final long instance; + private final BookmarkBase bookmark; + private final Uri openUri; private BitmapDrawable surface; private LibFreeRDP.UIEventListener uiEventListener; diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/domain/ManualBookmark.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/domain/ManualBookmark.java index 874d4e934..1e1a828ee 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/domain/ManualBookmark.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/domain/ManualBookmark.java @@ -40,7 +40,7 @@ public class ManualBookmark extends BookmarkBase hostname = parcel.readString(); port = parcel.readInt(); - enableGatewaySettings = (parcel.readInt() == 1 ? true : false); + enableGatewaySettings = (parcel.readInt() == 1); gatewaySettings = parcel.readParcelable(GatewaySettings.class.getClassLoader()); } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/AboutActivity.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/AboutActivity.java index 44aea6c87..edcbb96d4 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/AboutActivity.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/AboutActivity.java @@ -31,7 +31,7 @@ public class AboutActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); - mWebView = (WebView)findViewById(R.id.activity_about_webview); + mWebView = findViewById(R.id.activity_about_webview); } @Override protected void onResume() diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java index cbdabb1a0..c0c9f9325 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/BookmarkActivity.java @@ -209,7 +209,7 @@ public class BookmarkActivity extends PreferenceActivity implements OnSharedPref { if (!LibFreeRDP.hasH264Support()) { - final int preferenceIdList[] = { R.string.preference_key_h264, + final int[] preferenceIdList = { R.string.preference_key_h264, R.string.preference_key_h264_3g }; PreferenceManager mgr = getPreferenceManager(); @@ -609,11 +609,9 @@ public class BookmarkActivity extends PreferenceActivity implements OnSharedPref private boolean verifySettings(SharedPreferences sharedPreferences) { - boolean verifyFailed = false; + boolean verifyFailed = sharedPreferences.getString("bookmark.label", "").length() == 0; // perform sanity checks on settings // Label set - if (sharedPreferences.getString("bookmark.label", "").length() == 0) - verifyFailed = true; // Server and port specified if (!verifyFailed && sharedPreferences.getString("bookmark.hostname", "").length() == 0) @@ -671,8 +669,6 @@ public class BookmarkActivity extends PreferenceActivity implements OnSharedPref } }) .show(); - - return; } else { diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/HomeActivity.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/HomeActivity.java index f8cd21c96..9547ff165 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/HomeActivity.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/HomeActivity.java @@ -101,10 +101,10 @@ public class HomeActivity extends AppCompatActivity } // load views - clearTextButton = (Button)findViewById(R.id.clear_search_btn); - superBarEditText = (EditText)findViewById(R.id.superBarEditText); + clearTextButton = findViewById(R.id.clear_search_btn); + superBarEditText = findViewById(R.id.superBarEditText); - listViewBookmarks = (ListView)findViewById(R.id.listViewBookmarks); + listViewBookmarks = findViewById(R.id.listViewBookmarks); // set listeners for the list view listViewBookmarks.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/ScrollView2D.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/ScrollView2D.java index ad1d572e8..db79496f3 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/ScrollView2D.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/ScrollView2D.java @@ -1344,6 +1344,6 @@ public class ScrollView2D extends FrameLayout // interface to receive notifications when the view is scrolled public interface ScrollView2DListener { - abstract void onScrollChanged(ScrollView2D scrollView, int x, int y, int oldx, int oldy); + void onScrollChanged(ScrollView2D scrollView, int x, int y, int oldx, int oldy); } } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionActivity.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionActivity.java index b66a0cd97..461585b34 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionActivity.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionActivity.java @@ -255,13 +255,13 @@ public class SessionActivity extends AppCompatActivity } }); - sessionView = (SessionView)findViewById(R.id.sessionView); + sessionView = findViewById(R.id.sessionView); sessionView.setScaleGestureDetector( new ScaleGestureDetector(this, new PinchZoomListener())); sessionView.setSessionViewListener(this); sessionView.requestFocus(); - touchPointerView = (TouchPointerView)findViewById(R.id.touchPointerView); + touchPointerView = findViewById(R.id.touchPointerView); touchPointerView.setTouchPointerListener(this); keyboardMapper = new KeyboardMapper(); @@ -274,20 +274,20 @@ public class SessionActivity extends AppCompatActivity cursorKeyboard = new Keyboard(getApplicationContext(), R.xml.cursor_keyboard); // hide keyboard below the sessionView - keyboardView = (KeyboardView)findViewById(R.id.extended_keyboard); + keyboardView = findViewById(R.id.extended_keyboard); keyboardView.setKeyboard(specialkeysKeyboard); keyboardView.setOnKeyboardActionListener(this); - modifiersKeyboardView = (KeyboardView)findViewById(R.id.extended_keyboard_header); + modifiersKeyboardView = findViewById(R.id.extended_keyboard_header); modifiersKeyboardView.setKeyboard(modifiersKeyboard); modifiersKeyboardView.setOnKeyboardActionListener(this); - scrollView = (ScrollView2D)findViewById(R.id.sessionScrollView); + scrollView = findViewById(R.id.sessionScrollView); scrollView.setScrollViewListener(this); uiHandler = new UIHandler(); libFreeRDPBroadcastReceiver = new LibFreeRDPBroadcastReceiver(); - zoomControls = (ZoomControls)findViewById(R.id.zoomControls); + zoomControls = findViewById(R.id.zoomControls); zoomControls.hide(); zoomControls.setOnZoomInClickListener(new View.OnClickListener() { @Override public void onClick(View v) @@ -313,7 +313,7 @@ public class SessionActivity extends AppCompatActivity // register freerdp events broadcast receiver IntentFilter filter = new IntentFilter(); filter.addAction(GlobalApp.ACTION_EVENT_FREERDP); - registerReceiver(libFreeRDPBroadcastReceiver, filter); + registerReceiver(libFreeRDPBroadcastReceiver, filter, RECEIVER_EXPORTED); mClipboardManager = ClipboardManagerProxy.getClipboardManager(this); mClipboardManager.addClipboardChangedListener(this); @@ -501,8 +501,8 @@ public class SessionActivity extends AppCompatActivity static class ConnectThread extends Thread { - private SessionState runnableSession; - private Context context; + private final SessionState runnableSession; + private final Context context; public ConnectThread(@NonNull Context context, @NonNull SessionState session) { @@ -1161,10 +1161,13 @@ public class SessionActivity extends AppCompatActivity { int mappedX = (int)((float)(x + scrollView.getScrollX()) / sessionView.getZoom()); int mappedY = (int)((float)(y + scrollView.getScrollY()) / sessionView.getZoom()); - if (mappedX > bitmap.getWidth()) - mappedX = bitmap.getWidth(); - if (mappedY > bitmap.getHeight()) - mappedY = bitmap.getHeight(); + if (bitmap != null) + { + if (mappedX > bitmap.getWidth()) + mappedX = bitmap.getWidth(); + if (mappedY > bitmap.getHeight()) + mappedY = bitmap.getHeight(); + } return new Point(mappedX, mappedY); } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java index 31fe01875..0ee1d88d6 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/SessionView.java @@ -28,6 +28,8 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; +import androidx.annotation.NonNull; + import com.freerdp.freerdpcore.application.SessionState; import com.freerdp.freerdpcore.services.LibFreeRDP; import com.freerdp.freerdpcore.utils.DoubleGestureDetector; @@ -228,14 +230,17 @@ public class SessionView extends View (int)(height * scaleFactor) + touchPointerPaddingHeight); } - @Override public void onDraw(Canvas canvas) + @Override public void onDraw(@NonNull Canvas canvas) { super.onDraw(canvas); canvas.save(); canvas.concat(scaleMatrix); canvas.drawColor(Color.BLACK); - surface.draw(canvas); + if (surface != null) + { + surface.draw(canvas); + } canvas.restore(); } @@ -278,17 +283,17 @@ public class SessionView extends View } public interface SessionViewListener { - abstract void onSessionViewBeginTouch(); + void onSessionViewBeginTouch(); - abstract void onSessionViewEndTouch(); + void onSessionViewEndTouch(); - abstract void onSessionViewLeftTouch(int x, int y, boolean down); + void onSessionViewLeftTouch(int x, int y, boolean down); - abstract void onSessionViewRightTouch(int x, int y, boolean down); + void onSessionViewRightTouch(int x, int y, boolean down); - abstract void onSessionViewMove(int x, int y); + void onSessionViewMove(int x, int y); - abstract void onSessionViewScroll(boolean down); + void onSessionViewScroll(boolean down); } private class SessionGestureListener extends GestureDetector.SimpleOnGestureListener diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/TouchPointerView.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/TouchPointerView.java index 6b8b96ce6..523cc52f7 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/TouchPointerView.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/presentation/TouchPointerView.java @@ -52,12 +52,12 @@ public class TouchPointerView extends ImageView private static final float SCROLL_DELTA = 10.0f; private static final int DEFAULT_TOUCH_POINTER_RESTORE_DELAY = 150; private RectF pointerRect; - private RectF pointerAreaRects[] = new RectF[9]; + private final RectF[] pointerAreaRects = new RectF[9]; private Matrix translationMatrix; private boolean pointerMoving = false; private boolean pointerScrolling = false; private TouchPointerListener listener = null; - private UIHandler uiHandler = new UIHandler(); + private final UIHandler uiHandler = new UIHandler(); // gesture detection private GestureDetector gestureDetector; public TouchPointerView(Context context) @@ -174,18 +174,14 @@ public class TouchPointerView extends ImageView { RectF transRect = new RectF(pointerAreaRects[area]); translationMatrix.mapRect(transRect); - if (transRect.contains(event.getX(), event.getY())) - return true; - return false; + return transRect.contains(event.getX(), event.getY()); } private boolean pointerTouched(MotionEvent event) { RectF transRect = new RectF(pointerRect); translationMatrix.mapRect(transRect); - if (transRect.contains(event.getX(), event.getY())) - return true; - return false; + return transRect.contains(event.getX(), event.getY()); } @Override public boolean onTouchEvent(MotionEvent event) @@ -205,21 +201,21 @@ public class TouchPointerView extends ImageView // touch pointer listener - is triggered if an action field is public interface TouchPointerListener { - abstract void onTouchPointerClose(); + void onTouchPointerClose(); - abstract void onTouchPointerLeftClick(int x, int y, boolean down); + void onTouchPointerLeftClick(int x, int y, boolean down); - abstract void onTouchPointerRightClick(int x, int y, boolean down); + void onTouchPointerRightClick(int x, int y, boolean down); - abstract void onTouchPointerMove(int x, int y); + void onTouchPointerMove(int x, int y); - abstract void onTouchPointerScroll(boolean down); + void onTouchPointerScroll(boolean down); - abstract void onTouchPointerToggleKeyboard(); + void onTouchPointerToggleKeyboard(); - abstract void onTouchPointerToggleExtKeyboard(); + void onTouchPointerToggleExtKeyboard(); - abstract void onTouchPointerResetScrollZoom(); + void onTouchPointerResetScrollZoom(); } private class UIHandler extends Handler diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java index a4e510440..38bc46684 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java @@ -25,7 +25,7 @@ import java.util.ArrayList; public abstract class BookmarkBaseGateway { private final static String TAG = "BookmarkBaseGateway"; - private SQLiteOpenHelper bookmarkDB; + private final SQLiteOpenHelper bookmarkDB; private static final String JOIN_PREFIX = "join_"; private static final String KEY_BOOKMARK_ID = "bookmarkId"; diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkDB.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkDB.java index c168f7cb2..8f95ec1d2 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkDB.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/BookmarkDB.java @@ -111,7 +111,7 @@ public class BookmarkDB extends SQLiteOpenHelper { if (i != 0) buf.append(delim); - buf.append((String)list.get(i)); + buf.append(list.get(i)); } return buf.toString(); } diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java index 200be381e..e22c58b37 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/LibFreeRDP.java @@ -59,7 +59,7 @@ public class LibFreeRDP } catch (UnsatisfiedLinkError e) { - Log.e(TAG, "Failed to load library " + lib + ": " + e.toString()); + Log.e(TAG, "Failed to load library " + lib + ": " + e); success = false; break; } @@ -111,7 +111,7 @@ public class LibFreeRDP } catch (UnsatisfiedLinkError e) { - Log.e(TAG, "Failed to load library: " + e.toString()); + Log.e(TAG, "Failed to load library: " + e); throw e; } } @@ -260,7 +260,7 @@ public class LibFreeRDP String hostname = bookmark.get().getHostname(); args.add("/v:" + hostname); - args.add("/port:" + String.valueOf(port)); + args.add("/port:" + port); arg = bookmark.getUsername(); if (!arg.isEmpty()) @@ -280,7 +280,7 @@ public class LibFreeRDP args.add( String.format("/size:%dx%d", screenSettings.getWidth(), screenSettings.getHeight())); - args.add("/bpp:" + String.valueOf(screenSettings.getColors())); + args.add("/bpp:" + screenSettings.getColors()); if (advanced.getConsoleMode()) { @@ -380,7 +380,7 @@ public class LibFreeRDP /* 0 ... local 1 ... remote 2 ... disable */ - args.add("/audio-mode:" + String.valueOf(advanced.getRedirectSound())); + args.add("/audio-mode:" + advanced.getRedirectSound()); if (advanced.getRedirectSound() == 0) { args.add("/sound"); @@ -420,7 +420,7 @@ public class LibFreeRDP int port = openUri.getPort(); if (hostname != null) { - hostname = hostname + ((port == -1) ? "" : (":" + String.valueOf(port))); + hostname = hostname + ((port == -1) ? "" : (":" + port)); args.add("/v:" + hostname); } @@ -636,7 +636,8 @@ public class LibFreeRDP return freerdp_get_version(); } - public static interface EventListener { + public interface EventListener + { void OnPreConnect(long instance); void OnConnectionSuccess(long instance); @@ -648,7 +649,8 @@ public class LibFreeRDP void OnDisconnected(long instance); } - public static interface UIEventListener { + public interface UIEventListener + { void OnSettingsChanged(int width, int height, int bpp); boolean OnAuthenticate(StringBuilder username, StringBuilder domain, diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/QuickConnectHistoryGateway.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/QuickConnectHistoryGateway.java index 763977786..a4f232137 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/QuickConnectHistoryGateway.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/services/QuickConnectHistoryGateway.java @@ -25,7 +25,7 @@ import java.util.ArrayList; public class QuickConnectHistoryGateway { private final static String TAG = "QuickConnectHistoryGateway"; - private SQLiteOpenHelper historyDB; + private final SQLiteOpenHelper historyDB; public QuickConnectHistoryGateway(SQLiteOpenHelper historyDB) { diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/BookmarkArrayAdapter.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/BookmarkArrayAdapter.java index 6c6de6acc..20f2ecf92 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/BookmarkArrayAdapter.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/BookmarkArrayAdapter.java @@ -49,9 +49,9 @@ public class BookmarkArrayAdapter extends ArrayAdapter } BookmarkBase bookmark = getItem(position); - TextView label = (TextView)curView.findViewById(R.id.bookmark_text1); - TextView hostname = (TextView)curView.findViewById(R.id.bookmark_text2); - ImageView star_icon = (ImageView)curView.findViewById(R.id.bookmark_icon2); + TextView label = curView.findViewById(R.id.bookmark_text1); + TextView hostname = curView.findViewById(R.id.bookmark_text2); + ImageView star_icon = curView.findViewById(R.id.bookmark_icon2); assert label != null; assert hostname != null; diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ButtonPreference.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ButtonPreference.java index 72c8cf081..18adaadc0 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ButtonPreference.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ButtonPreference.java @@ -57,7 +57,7 @@ public class ButtonPreference extends Preference @Override public View getView(View convertView, ViewGroup parent) { View v = super.getView(convertView, parent); - button = (Button)v.findViewById(R.id.preference_button); + button = v.findViewById(R.id.preference_button); if (buttonText != null) button.setText(buttonText); if (buttonOnClickListener != null) @@ -66,7 +66,7 @@ public class ButtonPreference extends Preference // additional init for ICS - make widget frame visible // refer to // http://stackoverflow.com/questions/8762984/custom-preference-broken-in-honeycomb-ics - LinearLayout widgetFrameView = ((LinearLayout)v.findViewById(android.R.id.widget_frame)); + LinearLayout widgetFrameView = v.findViewById(android.R.id.widget_frame); widgetFrameView.setVisibility(View.VISIBLE); return v; diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ClipboardManagerProxy.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ClipboardManagerProxy.java index 9a1c3a35b..c5cbead51 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ClipboardManagerProxy.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/ClipboardManagerProxy.java @@ -26,7 +26,8 @@ public abstract class ClipboardManagerProxy public abstract void getPrimaryClipManually(); - public static interface OnClipboardChangedListener { + public interface OnClipboardChangedListener + { void onClipboardChanged(String data); } @@ -59,7 +60,7 @@ public abstract class ClipboardManagerProxy private static class HCClipboardManager extends ClipboardManagerProxy implements ClipboardManager.OnPrimaryClipChangedListener { - private ClipboardManager mClipboardManager; + private final ClipboardManager mClipboardManager; private OnClipboardChangedListener mListener; public HCClipboardManager(Context ctx) diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java index 2b74a6d3f..df3d6e243 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/DoubleGestureDetector.java @@ -234,7 +234,7 @@ public class DoubleGestureDetector break; } - if ((action == MotionEvent.ACTION_MOVE) && handled == false) + if ((action == MotionEvent.ACTION_MOVE) && !handled) handled = true; return handled; diff --git a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java index 654cd671c..7f6bb5b87 100644 --- a/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java +++ b/client/Android/Studio/freeRDPCore/src/main/java/com/freerdp/freerdpcore/utils/KeyboardMapper.java @@ -229,7 +229,7 @@ public class KeyboardMapper public void init(Context context) { - if (initialized == true) + if (initialized) return; keymapAndroid = new int[256]; @@ -714,12 +714,12 @@ public class KeyboardMapper // interface that gets called for input handling public interface KeyProcessingListener { - abstract void processVirtualKey(int virtualKeyCode, boolean down); + void processVirtualKey(int virtualKeyCode, boolean down); - abstract void processUnicodeKey(int unicodeKey); + void processUnicodeKey(int unicodeKey); - abstract void switchKeyboard(int keyboardType); + void switchKeyboard(int keyboardType); - abstract void modifiersChanged(); + void modifiersChanged(); } } diff --git a/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml b/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml index f05612aa6..5efdf794d 100644 --- a/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml +++ b/client/Android/Studio/freeRDPCore/src/main/res/layout/session.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent"> - -