diff options
Diffstat (limited to 'app/src/main/java/org')
5 files changed, 32 insertions, 104 deletions
diff --git a/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java b/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java index d61ef59..2835d1b 100644 --- a/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java +++ b/app/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java @@ -53,7 +53,7 @@ public class IBM437 extends Charset { } - private native int nDecode(char[] array, int arrPosition, int remaining, long outAddr, int absolutePos); +// private native int nDecode(char[] array, int arrPosition, int remaining, long outAddr, int absolutePos); protected CoderResult decodeLoop(ByteBuffer bb, CharBuffer cb){ @@ -151,7 +151,7 @@ public class IBM437 extends Charset { super(cs, 1, 1); } - private native void nEncode(long outAddr, int absolutePos, char[] array, int arrPosition, int[] res); +// private native void nEncode(long outAddr, int absolutePos, char[] array, int arrPosition, int[] res); protected CoderResult encodeLoop(CharBuffer cb, ByteBuffer bb){ int bbRemaining = bb.remaining(); diff --git a/app/src/main/java/org/connectbot/ActionBarWrapper.java b/app/src/main/java/org/connectbot/ActionBarWrapper.java deleted file mode 100644 index f6bed8c..0000000 --- a/app/src/main/java/org/connectbot/ActionBarWrapper.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * ConnectBot: simple, powerful, open-source SSH client for Android - * Copyright 2007 Kenny Root, Jeffrey Sharkey - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.connectbot; - -import org.connectbot.util.PreferenceConstants; - -import android.annotation.TargetApi; -import android.app.Activity; -import android.app.ActionBar; - -public abstract class ActionBarWrapper { - public interface OnMenuVisibilityListener { - public void onMenuVisibilityChanged(boolean isVisible); - } - - public static ActionBarWrapper getActionBar(Activity activity) { - if (PreferenceConstants.PRE_HONEYCOMB) - return new DummyActionBar(); - else - return new RealActionBar(activity); - } - - public void hide() { - } - - public void show() { - } - - public void addOnMenuVisibilityListener(OnMenuVisibilityListener listener) { - } - - public void setDisplayHomeAsUpEnabled(boolean showHomeAsUp) { - } - - private static class DummyActionBar extends ActionBarWrapper { - } - - /** - * Real ActionBar delegate that is only invoked on Honeycomb - * and later. - */ - @TargetApi(11) - private static class RealActionBar extends ActionBarWrapper { - private final ActionBar actionBar; - - public RealActionBar(Activity activity) { - actionBar = activity.getActionBar(); - } - - @Override - public void hide() { - actionBar.hide(); - } - - @Override - public void show() { - actionBar.show(); - } - - @Override - public void addOnMenuVisibilityListener(final OnMenuVisibilityListener listener) { - actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() { - public void onMenuVisibilityChanged(boolean isVisible) { - listener.onMenuVisibilityChanged(isVisible); - } - }); - } - - @Override - public void setDisplayHomeAsUpEnabled(boolean showHomeAsUp) { - actionBar.setDisplayHomeAsUpEnabled(showHomeAsUp); - } - } -} diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index d6ee629..6f72783 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -30,7 +30,6 @@ import org.connectbot.service.TerminalKeyListener; import org.connectbot.service.TerminalManager; import org.connectbot.util.PreferenceConstants; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.ComponentName; @@ -55,6 +54,8 @@ import android.support.design.widget.TabLayout; import android.support.v4.view.MotionEventCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.text.ClipboardManager; import android.util.Log; @@ -91,7 +92,7 @@ import android.widget.TextView; import android.widget.Toast; import de.mud.terminal.vt320; -public class ConsoleActivity extends Activity implements BridgeDisconnectedListener { +public class ConsoleActivity extends AppCompatActivity implements BridgeDisconnectedListener { public final static String TAG = "CB.ConsoleActivity"; protected static final int REQUEST_EDIT = 1; @@ -148,7 +149,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe private ImageView mKeyboardButton; - private ActionBarWrapper actionBar; + private ActionBar actionBar; private boolean inActionBarMenu = false; private boolean titleBarHide; @@ -341,7 +342,7 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe titleBarHide = prefs.getBoolean(PreferenceConstants.TITLEBARHIDE, false); if (titleBarHide) { - getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY); + supportRequestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY); } this.setContentView(R.layout.act_console); @@ -451,12 +452,12 @@ public class ConsoleActivity extends Activity implements BridgeDisconnectedListe findViewById(R.id.button_left).setOnClickListener(emulatedKeysListener); findViewById(R.id.button_right).setOnClickListener(emulatedKeysListener); - actionBar = ActionBarWrapper.getActionBar(this); + actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); if (titleBarHide) { actionBar.hide(); } - actionBar.addOnMenuVisibilityListener(new ActionBarWrapper.OnMenuVisibilityListener() { + actionBar.addOnMenuVisibilityListener(new ActionBar.OnMenuVisibilityListener() { public void onMenuVisibilityChanged(boolean isVisible) { inActionBarMenu = isVisible; if (isVisible == false) { diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java index 0abcf17..1e78d72 100644 --- a/app/src/main/java/org/connectbot/HelpActivity.java +++ b/app/src/main/java/org/connectbot/HelpActivity.java @@ -20,10 +20,12 @@ package org.connectbot; import java.io.IOException; import android.app.Activity; +import android.app.AlertDialog; import android.content.Intent; import android.content.res.AssetManager; import android.os.Bundle; import android.util.Log; +import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; @@ -39,6 +41,9 @@ public class HelpActivity extends Activity { public final static String HELPDIR = "help"; public final static String SUFFIX = ".html"; + private LayoutInflater inflater = null; + + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -74,17 +79,28 @@ public class HelpActivity extends Activity { Log.e(TAG, "couldn't get list of help assets", e); } - Button button = new Button(this); - final String topic = getResources().getString(R.string.terms_and_conditions); - button.setText(topic); + inflater = LayoutInflater.from(this); + Button shortcutsButton = new Button(this); + shortcutsButton.setText(getResources().getString(R.string.keyboard_shortcuts)); + shortcutsButton.setOnClickListener(new OnClickListener() { + public void onClick(View v) { + final View shortcuts = inflater.inflate(R.layout.dia_keyboard_shortcuts, null, false); + new AlertDialog.Builder(HelpActivity.this) + .setView(shortcuts) + .setTitle(R.string.keyboard_shortcuts) + .show(); + } + }); + content.addView(shortcutsButton); - button.setOnClickListener(new OnClickListener() { + Button eulaButton = new Button(this); + eulaButton.setText(getResources().getString(R.string.terms_and_conditions)); + eulaButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { Intent intent = new Intent(HelpActivity.this, EulaActivity.class); HelpActivity.this.startActivity(intent); } }); - - content.addView(button); + content.addView(eulaButton); } } diff --git a/app/src/main/java/org/connectbot/util/HostDatabase.java b/app/src/main/java/org/connectbot/util/HostDatabase.java index 4756157..d8cdf09 100644 --- a/app/src/main/java/org/connectbot/util/HostDatabase.java +++ b/app/src/main/java/org/connectbot/util/HostDatabase.java @@ -678,7 +678,7 @@ public class HostDatabase extends RobustSQLiteOpenHelper { null, null, null); while (c.moveToNext()) { - colors[c.getInt(0)] = new Integer(c.getInt(1)); + colors[c.getInt(0)] = Integer.valueOf(c.getInt(1)); } c.close(); |