diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ae6f202..6e8f286 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,126 +1,139 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + have been supplied, we are a good candidate. + + + + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ic_launcher.png b/ic_launcher.png index 77885c7..60cf725 100644 Binary files a/ic_launcher.png and b/ic_launcher.png differ diff --git a/ic_launcher_small.png b/ic_launcher_small.png index 7fec34d..03c2a09 100644 Binary files a/ic_launcher_small.png and b/ic_launcher_small.png differ diff --git a/res/drawable-hdpi/ic_action_refresh.png b/res/drawable-hdpi/ic_action_refresh.png new file mode 100644 index 0000000..085cd24 Binary files /dev/null and b/res/drawable-hdpi/ic_action_refresh.png differ diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png index 91347fa..ac5cdbb 100644 Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_action_refresh.png b/res/drawable-mdpi/ic_action_refresh.png new file mode 100644 index 0000000..b8c4cb6 Binary files /dev/null and b/res/drawable-mdpi/ic_action_refresh.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..b891dfd Binary files /dev/null and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/ic_action_refresh.png b/res/drawable-xhdpi/ic_action_refresh.png new file mode 100644 index 0000000..2b36d6f Binary files /dev/null and b/res/drawable-xhdpi/ic_action_refresh.png differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png index e781abc..1001e14 100644 Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png index cf420bd..483bcde 100644 Binary files a/res/drawable-xxhdpi/ic_launcher.png and b/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..0d5038f Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 52a065c..a9ae3e0 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -9,7 +9,7 @@ android:id="@+id/urlBar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentLeft="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" > diff --git a/res/menu/incognito_menu.xml b/res/menu/incognito_menu.xml index 5596a0d..5d8a295 100644 --- a/res/menu/incognito_menu.xml +++ b/res/menu/incognito_menu.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/res/menu/menu.xml b/res/menu/menu.xml index 4d4cfdf..2565675 100644 --- a/res/menu/menu.xml +++ b/res/menu/menu.xml @@ -1,11 +1,11 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml new file mode 100644 index 0000000..5fb0259 --- /dev/null +++ b/res/values-ar/strings.xml @@ -0,0 +1,113 @@ + + + Lightning + جوجل + إعدادات المتصفح + الوصول إلى موقعك + حفظ كلمات السر + وكيل المستخدم + مسح السجل + راسلني + تفعيل مشغل الفلاش + عرض بشكل الجوال + عرض بشكل الكمبيوتر + عرض وكيل مستخدم مخصص + الصفحة الرئيسية + سوف يتم تطبيق الإعدادات فقط على علامات التبويب الجديدة + وضع ملء الشاشة + تفعيل الجافا + استعادة علامات التبويب المفقودة + الإعدادات + مسار التحميلات + الإعدادات المتقدمة + رمز المصدر + الرخصة + github.com/anthonycr/Lightning-Browser + ترخيص اباتشي 2.0 + الإعدادات الجديدة + الإعدادات + إصدار التطبيق + مسح ذاكرة التخزين المؤقتة عند الخروج + تفعيل إلتفاف النص + حظر الصور + السماح للمواقع بالفتح في نوافذ جديدة + تفعيل ملفات تعريف الارتباط + استيراد العلامات المرجعية من المتصفح + حجم النص + الإعدادات المتقدمة + (مستحسن) + (مواقع قد تبدو غريبة) + محرك البحث + بحث + استخدام إطار عرض واسع + تحميل الصفحات في نظرة عامة + استعادة علامات التبويب المفقودة عند البدء + السجل + إضافة إلى العلامات المرجعية + العلامات المرجعية + مشاركة + الإعدادات + علامة تبويب التخفي + علامة تبويب جديدة + (لا يوجد مخزون في المتصفح) + (دعم مخزون المتصفح ) + إخفاء شريط الحالة أثناء التصفح + مسح ملفات تعريف الارتباط + تفعيل إيماءات الأمام و الخلف + ماذا تريد أن تفعل مع هذه الصورة؟ + تحميل + فتح + ماذا تريد أن تفعل مع هذا الرابط؟ + مشاركة هذه الصفحة + ماذا تريد ان تفعل مع هذه العلامة المرجعية ؟ + حذف + صفحة فارغة + الافتراضي + الكمبيوتر + الجوال + مخصص + محرك البحث + حسنا + هل ترغب في تحميل هذا الملف؟ + إلغاء + تحذير + عفوا, لقد أجريت جوجل بعض التغييرات , و مشغل الفلاش لم يعد يعمل على أندرويد 4.4 فما فوق. + لم يتم العثور على مشغل الفلاش يرجى تثبيته من المتجر. + مشغل الفلاش لا يدعم أندرويد 4.2 فما فوق , و عند تفعيل الفلاش سوف يتعطل المتصفح . يرجى عدم إبلاغنا بالمشاكل في حال تفعيل مشغل الفلاش. + وكيل المستخدم + مسار التحميلات + صفحة رئيسية مخصصة + صفحة ويب + عفوا , لقد أجريت جوجل بعض التغييرات و إلتفاف النص لم يعد يعمل على أندرويد 4.4 فما فوق. + مسح السجل + مسح ملفات تعريف الارتباط + هل تريد مسح جميع سجلات التصفح ؟ + هل تريد مسح جميع ملفات تعريف الارتباط ؟ + نعم + لا + حجم النص + ضخم + كبير + عادي + صغير + ضئيل + خطأ + لم يتم العثور على متصفح ليتم إستيراد العلامات مرجعية . + العنوان + الرابط + تعديل العلامة المرجعية + تعديل + علامة تبويب التخفي + الافتراضي + فتح قائمة التنقل + إغلاق قائمة التنقل + البحث في الويب + تحديث + علامة تبويب جديدة + مشاركة + السجل + العلامات المرجعية + إضافة إلى العلامات المرجعية + نسخ الرابط + الأمام + \ No newline at end of file diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index a310681..bd6e3e6 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -57,4 +57,4 @@ Cookies löschen Vor- und Zurückgesten aktivieren - + \ No newline at end of file diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 1d06131..3f456ea 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1,6 +1,6 @@ - Lightning + Lightning Google Ajustes del navegador Acceder a tu ubicación @@ -56,4 +56,4 @@ Limpiar cookies Habilitar gestos de atrás y adelante - + \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 5c0e4dc..751e6d6 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -22,4 +22,4 @@ Paramètres Onglet incognito Nouvel onglet - + \ No newline at end of file diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 878ca3f..693d83f 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -1,21 +1,21 @@ - - - - Lightning - Google - הגדרות דפדפן - מאפשר לאתרים לגשת למיקומך - שמור את הסיסמאות שלך - סוכן משתמש - מחק הסטוריה ביציאה - שלח לי דוא\"ל - הפעל תכני פלאש (אם מותקן) - הצג כנייד - הצג כמחשב - הצג כסוכן משתמש מותאם אישית - דף הבית - הגדות מוחלות על כרטיסיות חדשות בלבד - הפעל מצב מסך מלא - הפעל JavaScript - + + + + Lightning + Google + הגדרות דפדפן + מאפשר לאתרים לגשת למיקומך + שמור את הסיסמאות שלך + סוכן משתמש + מחק הסטוריה ביציאה + שלח לי דוא\"ל + הפעל תכני פלאש (אם מותקן) + הצג כנייד + הצג כמחשב + הצג כסוכן משתמש מותאם אישית + דף הבית + הגדות מוחלות על כרטיסיות חדשות בלבד + הפעל מצב מסך מלא + הפעל JavaScript + \ No newline at end of file diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 22bbcf7..e1b3062 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -107,4 +107,4 @@ Для загрузки файла необходима карта памяти Карта памяти недоступна Карта памяти подключена к ПК. Для начала загрузки отключите её от ПК, нажав на уведомление - + \ No newline at end of file diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 84d5874..00d80de 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -3,7 +3,7 @@ Lightning Google - Tarayıcı ayarlarıstring> + Tarayıcı ayarlarıstring Konum erişimi Parolarınızı kaydetme Kullanıcı arayüzü @@ -53,5 +53,5 @@ Yeni pencere (Hiçbir stok tarayıcı tespit edilemedi) (Desteklenen stok tarayıcı tespit edildi) - - + + \ No newline at end of file diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 07b56a5..053d129 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1,17 +1,7 @@ - Lightning+ - 打开导航抽屉 - 关闭导航抽屉 - 网页搜索 - 刷新页面 - 新建标签 - 分享页面 - 历史记录 - 书签列表 - 添加书签 - 复制链接 - 前进 + + Lightning Google 浏览器设置 允许站点访问地理位置 @@ -45,6 +35,8 @@ 启用 Cookies 从浏览器中导入书签 页面文本尺寸 + AdvancedSettings + Hello world! （推荐） （可能导致部分网页排版混乱） 搜索引擎 @@ -52,63 +44,17 @@ 使用宽视图 使用概览模式载入页面 启动时恢复丢失页面 + 历史记录 + 添加书签 + 书签列表 + 分享页面 + 应用设置 + 隐身标签 + 新建标签 （尚未检测到已支持原生浏览器） （已检测到受支持的原生浏览器） 浏览时隐藏状态栏 清除浏览器 Cookies - 您希望对此图片进行什么操作？ - 下载 - 打开 - 您希望对此链接进行什么操作？ - 分享此页面 - What would you like to do with this bookmark? - 删除 - Blank Page - 默认 UA - 桌面访问 - 移动设备 - 自定义 UA - 搜索引擎 - 确认 - 您是否需要下载此文件？ - 取消 - 警告 - "非常抱歉，Google 对此做了一些更改导致 Adobe Flash 无法支持 Android 4.4 以及更高版本。" - "未检测到您的设备中安装了 Adobe Flash Player， -请先安装 Adobe Flash Player 后再启用此选项。" - Adobe Flash 无法正常支持 Android 4.2 以及更高版本并且可能导致浏览器崩溃，若您启用后出现浏览器崩溃的问题请勿对此问题进行反馈。 - User Agent - 下载目录 - 自定义主页 - 网页 - "非常抱歉，Google 对此做了一些更改导致文本重拍无法支持 Android 4.4 以及更高版本。" - 清除历史记录 - 清除 Cookies - 您是否确认清除所有浏览器历史记录？ - 您是否确认清除所有浏览器历史记录 Cookies？ - 确认 - 取消 - 文本大小 - 最大 - 较大 - 普通 - 较小 - 最小 - 错误 - 暂未检测到任何可导入书签的浏览器 - Title - URL - 编辑书签 - 编辑 - 新建隐身标签 - Hello world! - 默认页面 - 返回 - 页内搜索 - 正在开始下载… - 仅可下载以 \"http\" 或 \"https\" 开头的链接地址 - 未发现 SDCard - 为正常下载此文件需要 USB 存储设备。 - USB 存储不可用 - USB 存储设备目前正忙，为确保正常下载此文件请在通知栏中确认关闭 USB 大容量存储。 - + 启用前进后退手势控制 + + \ No newline at end of file diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 9129861..7940730 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1,57 +1,57 @@ - - - - Lightning - Google - 瀏覽器設置 - 允許站點訪問地理位置 - 保存密碼 - User Agent - 清空歷史記錄 - 郵件開發者 - 啟用 Adobe Flash - 作為移動設備訪問 - 作為桌面設備訪問 - 自定義 User Agent - 首頁 - 設置僅將應用於新標簽頁 - 啟用全屏模式 - 啟用 JavaScript - 恢復丟失標簽 - 設置 - 下載位置 - 高級設置 - 源碼 - 許可證 - github.com/anthonycr/Lightning-Browser - Apache License 2.0 - NewSettings - 設置 - 應用版本 - 退出時清理緩存 - 啟用文本重排 - 屏蔽網頁圖像 - 允許站點打開新窗口 - 啟用 Cookies - 從瀏覽器中導入書簽 - 頁面文本尺寸 - AdvancedSettings - Hello world! - （推薦） - （部分網頁可能看起來很奇怪） - 搜索引擎 - 搜索 - 使用寬視圖 - 使用概覽模式載入頁面 - 啟動時恢復丟失頁面 - 歷史記錄 - 添加書簽 - 書簽列表 - 分享頁面 - 應用設置 - 隱身標簽 - 新建標簽 - （尚未檢測到原生瀏覽器） - （檢測到已支持的原生瀏覽器） - + + + + Lightning + Google + 瀏覽器設置 + 允許站點訪問地理位置 + 保存密碼 + User Agent + 清空歷史記錄 + 郵件開發者 + 啟用 Adobe Flash + 作為移動設備訪問 + 作為桌面設備訪問 + 自定義 User Agent + 首頁 + 設置僅將應用於新標簽頁 + 啟用全屏模式 + 啟用 JavaScript + 恢復丟失標簽 + 設置 + 下載位置 + 高級設置 + 源碼 + 許可證 + github.com/anthonycr/Lightning-Browser + Apache License 2.0 + NewSettings + 設置 + 應用版本 + 退出時清理緩存 + 啟用文本重排 + 屏蔽網頁圖像 + 允許站點打開新窗口 + 啟用 Cookies + 從瀏覽器中導入書簽 + 頁面文本尺寸 + AdvancedSettings + Hello world! + （推薦） + （部分網頁可能看起來很奇怪） + 搜索引擎 + 搜索 + 使用寬視圖 + 使用概覽模式載入頁面 + 啟動時恢復丟失頁面 + 歷史記錄 + 添加書簽 + 書簽列表 + 分享頁面 + 應用設置 + 隱身標簽 + 新建標簽 + （尚未檢測到原生瀏覽器） + （檢測到已支持的原生瀏覽器） + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 4015c81..aef7080 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,9 +1,36 @@ + + Lightning + Open navigation drawer + Close navigation drawer + Web search + Refresh + New Tab + Share + History + Bookmarks + Add Bookmark + Copy Link + Forward Google - Browser Settings + Settings Location Access Save your passwords User Agent @@ -21,6 +48,7 @@ Settings Download Location Advanced Settings + Enable back and forward gestures Source Code License github.com/anthonycr/Lightning-Browser @@ -35,8 +63,6 @@ Enable Cookies Import bookmarks from Browser Text size - AdvancedSettings - Hello world! (Recommended) (Websites may look weird) Search Engine @@ -44,17 +70,63 @@ Use wide viewport Load pages in overview mode Restore lost tabs on start - History - Add bookmark - Bookmarks - Share - Settings - Incognito tab - New tab (No stock browser detected) (Supported stock browser detected) Hide status bar while browsing Clear browser cookies - Enable back and foward gestures + What would you like to do with this image? + Download + Open + What would you like to do with this link? + Share this page + What would you like to do with this bookmark? + Delete + Blank Page + Default + Desktop + Mobile + Custom + Search Engine + OK + Do you want to download this file? + Cancel + Warning + We\'re sorry, Google made some changes, and Adobe Flash no longer works on Android 4.4+ + Adobe Flash Player was not detected.\nPlease install Flash Player. + Adobe Flash does not support Andoid 4.2 and above, and will crash the browser. Please do not report any crashes that occur if you enable Flash. + User Agent + Download Location + Custom Homepage + Webpage + We\'re sorry, Google made some changes, and Text Reflow no longer works on Android 4.4+ + Clear History + Clear Cookies + Would you like to clear all browser history? + Would you like to clear all browser cookies? + Yes + No + Text Size + Largest + Large + Normal + Small + Smallest + Error + No browser was detected to import bookmarks from. + Title + URL + Edit Bookmark + Edit + New Incognito Tab + Hello world! + Default + Back + Find in Page + Starting download\u2026 + Can only download \"http\" or \"https\" URLs. + No SD card + USB storage is required to download the file. + USB storage unavailable + The storage is busy. To allow downloads, touch Turn Off USB Storage in the notification. \ No newline at end of file diff --git a/src/acr/browser/barebones/activities/AdvancedSettingsActivity.java b/src/acr/browser/barebones/activities/AdvancedSettingsActivity.java index 4346369..02565f8 100644 --- a/src/acr/browser/barebones/activities/AdvancedSettingsActivity.java +++ b/src/acr/browser/barebones/activities/AdvancedSettingsActivity.java @@ -422,10 +422,10 @@ public class AdvancedSettingsActivity extends Activity { public void onClick(View v) { AlertDialog.Builder builder = new AlertDialog.Builder( AdvancedSettingsActivity.this); // dialog - builder.setTitle("Clear History"); + builder.setTitle(CONTEXT.getResources().getString(R.string.title_clear_history)); builder.setMessage( - "Would you like to clear all browser history?") - .setPositiveButton("Yes", + CONTEXT.getResources().getString(R.string.dialog_history)) + .setPositiveButton(CONTEXT.getResources().getString(R.string.action_yes), new DialogInterface.OnClickListener() { @Override @@ -444,7 +444,7 @@ public class AdvancedSettingsActivity extends Activity { } }) - .setNegativeButton("No", + .setNegativeButton(CONTEXT.getResources().getString(R.string.action_no), new DialogInterface.OnClickListener() { @Override @@ -513,10 +513,10 @@ public class AdvancedSettingsActivity extends Activity { public void onClick(View v) { AlertDialog.Builder builder = new AlertDialog.Builder( AdvancedSettingsActivity.this); // dialog - builder.setTitle("Clear Cookies"); + builder.setTitle(CONTEXT.getResources().getString(R.string.title_clear_cookies)); builder.setMessage( - "Would you like to clear all browser cookies?") - .setPositiveButton("Yes", + CONTEXT.getResources().getString(R.string.dialog_cookies)) + .setPositiveButton(CONTEXT.getResources().getString(R.string.action_yes), new DialogInterface.OnClickListener() { @Override @@ -535,7 +535,7 @@ public class AdvancedSettingsActivity extends Activity { } }) - .setNegativeButton("No", + .setNegativeButton(CONTEXT.getResources().getString(R.string.action_no), new DialogInterface.OnClickListener() { @Override @@ -612,8 +612,14 @@ public class AdvancedSettingsActivity extends Activity { public void onClick(View v) { AlertDialog.Builder picker = new AlertDialog.Builder( AdvancedSettingsActivity.this); - picker.setTitle("Text Size"); - CharSequence[] chars = { "Largest", "Large", "Normal", "Small", "Smallest"}; + picker.setTitle(getResources().getString( + R.string.title_text_size)); + CharSequence[] chars = { + getResources().getString(R.string.size_largest), + getResources().getString(R.string.size_large), + getResources().getString(R.string.size_normal), + getResources().getString(R.string.size_small), + getResources().getString(R.string.size_smallest) }; int n = settings.getInt("textsize", 3); @@ -628,7 +634,7 @@ public class AdvancedSettingsActivity extends Activity { } }); - picker.setNeutralButton("OK", + picker.setNeutralButton(CONTEXT.getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override diff --git a/src/acr/browser/barebones/activities/BrowserActivity.java b/src/acr/browser/barebones/activities/BrowserActivity.java index c6e535f..b46f78a 100644 --- a/src/acr/browser/barebones/activities/BrowserActivity.java +++ b/src/acr/browser/barebones/activities/BrowserActivity.java @@ -168,7 +168,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { public static boolean DEVICE_HAS_GPS = false; // semi constants - public static Context CONTEXT; + public static Context mContext; public static String SEARCH; public static List tabList; @@ -250,8 +250,8 @@ public class BrowserActivity extends Activity implements OnTouchListener { currentTabTitle.setPadding(leftPad, 0, rightPad, 0); } } - final TextView title = new TextView(CONTEXT); - title.setText("New Tab"); + final TextView title = new TextView(mContext); + title.setText(mContext.getResources().getString(R.string.action_new_tab)); if (display) { if (API < 16) { title.setBackgroundDrawable(active); @@ -278,7 +278,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { Drawable[] drawables = title.getCompoundDrawables(); bounds = drawables[2].getBounds(); title.setOnTouchListener(ACTIVITY); - Animation holo = AnimationUtils.loadAnimation(CONTEXT, R.anim.up); + Animation holo = AnimationUtils.loadAnimation(mContext, R.anim.up); tabLayout.addView(title); title.setVisibility(View.INVISIBLE); holo.setAnimationListener(new AnimationListener() { @@ -300,7 +300,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { title.startAnimation(holo); urlTitle[id] = title; - urlTitle[id].setText("New Tab"); + urlTitle[id].setText(mContext.getResources().getString(R.string.action_new_tab)); if (theUrl != null) { main[id] = generateTab(id, theUrl, display); @@ -309,14 +309,14 @@ public class BrowserActivity extends Activity implements OnTouchListener { } } else { - Utils.showToast(CONTEXT, "Max number of tabs reached"); + Utils.showToast(mContext, "Max number of tabs reached"); } return id; } public static void deleteBookmark(String url) { - File book = new File(CONTEXT.getFilesDir(), "bookmarks"); - File bookUrl = new File(CONTEXT.getFilesDir(), "bookurl"); + File book = new File(mContext.getFilesDir(), "bookmarks"); + File bookUrl = new File(mContext.getFilesDir(), "bookurl"); int n = 0; try { BufferedWriter bookWriter = new BufferedWriter(new FileWriter(book)); @@ -355,7 +355,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { readUrl.close(); } catch (IOException ignored) { } - openBookmarks(CONTEXT, currentTab); + openBookmarks(mContext, currentTab); } public static void generateHistory(final CustomWebView view, @@ -425,7 +425,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { e.printStackTrace(); } if (uBar.isShown()) { - currentTabTitle.setText("History"); + currentTabTitle.setText(mContext.getResources().getString(R.string.menu_history)); setUrlText(""); getUrl.setPadding(tenPad, 0, tenPad, 0); } @@ -439,7 +439,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { public static CustomWebView generateTab(final int pageToView, String Url, final boolean display) { - CustomWebView view = new CustomWebView(CONTEXT); + CustomWebView view = new CustomWebView(mContext); view.setId(pageToView); view.setWebViewClient(new CustomWebViewClient(ACTIVITY)); view.setWebChromeClient(new CustomChromeClient(ACTIVITY)); @@ -459,7 +459,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { } uBar.bringToFront(); if (Url.contains("about:home")) { - goBookmarks(CONTEXT, view); + goBookmarks(mContext, view); } else if (Url.contains("about:blank")) { view.loadUrl(""); } else { @@ -477,15 +477,15 @@ public class BrowserActivity extends Activity implements OnTouchListener { if (view.isShown() && view.canGoBack() && gestures) { view.goBack(); } - Animation left = AnimationUtils.loadAnimation(CONTEXT, R.anim.left); + Animation left = AnimationUtils.loadAnimation(mContext, R.anim.left); background.startAnimation(left); } static List> getBookmarks() { List> bookmarks = new ArrayList>(); - File bookUrl = new File(CONTEXT.getFilesDir(), "bookurl"); - File book = new File(CONTEXT.getFilesDir(), "bookmarks"); + File bookUrl = new File(mContext.getFilesDir(), "bookurl"); + File book = new File(mContext.getFilesDir(), "bookmarks"); try { BufferedReader readUrl = new BufferedReader(new FileReader(bookUrl)); BufferedReader readBook = new BufferedReader(new FileReader(book)); @@ -532,7 +532,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { if (view.isShown() && view.canGoForward() && gestures) { view.goForward(); } - Animation right = AnimationUtils.loadAnimation(CONTEXT, R.anim.right); + Animation right = AnimationUtils.loadAnimation(mContext, R.anim.right); background.startAnimation(right); } @@ -560,11 +560,11 @@ public class BrowserActivity extends Activity implements OnTouchListener { } }; - AlertDialog.Builder builder = new AlertDialog.Builder(CONTEXT); // dialog - builder.setMessage("What would you like to do with this bookmark?") - .setPositiveButton("Rename", dialogClickListener) - .setNegativeButton("Open", dialogClickListener) - .setNeutralButton("Delete", dialogClickListener).show(); + AlertDialog.Builder builder = new AlertDialog.Builder(mContext); // dialog + builder.setMessage(mContext.getResources().getString(R.string.dialog_bookmark)) + .setPositiveButton(mContext.getResources().getString(R.string.action_edit), dialogClickListener) + .setNegativeButton(mContext.getResources().getString(R.string.action_open), dialogClickListener) + .setNeutralButton(mContext.getResources().getString(R.string.action_delete), dialogClickListener).show(); } } @@ -620,7 +620,8 @@ public class BrowserActivity extends Activity implements OnTouchListener { FrameLayout screen = (FrameLayout) ACTIVITY.getWindow().getDecorView(); screen.removeView(fullScreenContainer); fullScreenContainer = null; - mCustomViewCallback.onCustomViewHidden(); + //mCustomViewCallback.onCustomViewHidden(); + //apparently causing browser to crash when video ends ACTIVITY.setRequestedOrientation(orientation); background.addView(currentTab); uBar.setVisibility(View.VISIBLE); @@ -636,7 +637,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { } final HitTestResult result = currentTab.getHitTestResult(); if (currentTab.getUrl().contains( - "file://" + CONTEXT.getFilesDir() + "/bookmarks.html")) { + "file://" + mContext.getFilesDir() + "/bookmarks.html")) { click = new Message(); click.arg1 = n; click.setTarget(new ClickHandler()); @@ -667,7 +668,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { if (API > 8) { String url = result.getExtra(); - Utils.downloadFile(CONTEXT, url, null, null); + Utils.downloadFile(mContext, url, null, null); } break; @@ -677,14 +678,14 @@ public class BrowserActivity extends Activity implements OnTouchListener { }; AlertDialog.Builder builder = new AlertDialog.Builder( - CONTEXT); // dialog + mContext); // dialog builder.setMessage( - "What would you like to do with this image?") - .setPositiveButton("Open in New Tab", + mContext.getResources().getString(R.string.dialog_image)) + .setPositiveButton(mContext.getResources().getString(R.string.action_new_tab), dialogClickListener) - .setNegativeButton("Open Normally", + .setNegativeButton(mContext.getResources().getString(R.string.action_open), dialogClickListener) - .setNeutralButton("Download Image", + .setNeutralButton(mContext.getResources().getString(R.string.action_download), dialogClickListener).show(); } else { @@ -723,15 +724,15 @@ public class BrowserActivity extends Activity implements OnTouchListener { }; AlertDialog.Builder builder = new AlertDialog.Builder( - CONTEXT); // dialog + mContext); // dialog builder.setTitle(result.getExtra()) .setMessage( - "What do you want to do with this link?") - .setPositiveButton("Open in New Tab", + mContext.getResources().getString(R.string.dialog_link)) + .setPositiveButton(mContext.getResources().getString(R.string.action_new_tab), dialogClickListener) - .setNegativeButton("Open Normally", + .setNegativeButton(mContext.getResources().getString(R.string.action_open), dialogClickListener) - .setNeutralButton("Copy link", dialogClickListener) + .setNeutralButton(mContext.getResources().getString(R.string.action_copy), dialogClickListener) .show(); } } @@ -807,7 +808,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { if (title != null && title.length() != 0) { urlTitle[numberPage].setText(title); urlToLoad[numberPage][1] = title; - Utils.updateHistory(CONTEXT, CONTEXT.getContentResolver(), + Utils.updateHistory(mContext, mContext.getContentResolver(), noStockBrowser, urlToLoad[numberPage][0], title); } } @@ -861,10 +862,10 @@ public class BrowserActivity extends Activity implements OnTouchListener { public static void reinitializeSettings() { int size = tabList.size(); cookieManager = CookieManager.getInstance(); - CookieSyncManager.createInstance(CONTEXT); + CookieSyncManager.createInstance(mContext); cookieManager.setAcceptCookie(settings.getBoolean("cookies", true)); for (int n = 0; n < size; n++) { - main[tabList.get(n)].settingsInitialization(CONTEXT); + main[tabList.get(n)].settingsInitialization(mContext); } } @@ -879,20 +880,20 @@ public class BrowserActivity extends Activity implements OnTouchListener { } } - final AlertDialog.Builder homePicker = new AlertDialog.Builder(CONTEXT); - homePicker.setTitle("Rename Bookmark"); - final EditText getText = new EditText(CONTEXT); + final AlertDialog.Builder homePicker = new AlertDialog.Builder(mContext); + homePicker.setTitle(mContext.getResources().getString(R.string.title_edit_bookmark)); + final EditText getText = new EditText(mContext); getText.setText(bTitle[index]); homePicker.setView(getText); - homePicker.setPositiveButton("OK", + homePicker.setPositiveButton(mContext.getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { bTitle[index] = getText.getText().toString(); - File book = new File(CONTEXT.getFilesDir(), "bookmarks"); - File bookUrl = new File(CONTEXT.getFilesDir(), + File book = new File(mContext.getFilesDir(), "bookmarks"); + File bookUrl = new File(mContext.getFilesDir(), "bookurl"); int n = 0; try { @@ -934,7 +935,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { readUrl.close(); } catch (IOException ignored) { } - openBookmarks(CONTEXT, currentTab); + openBookmarks(mContext, currentTab); } }); homePicker.show(); @@ -1020,8 +1021,8 @@ public class BrowserActivity extends Activity implements OnTouchListener { shareIntent.putExtra(android.content.Intent.EXTRA_TEXT, shareMessage); // start the chooser for sharing - CONTEXT.startActivity(Intent.createChooser(shareIntent, - "Share this page")); + mContext.startActivity(Intent.createChooser(shareIntent, + mContext.getResources().getString(R.string.dialog_title_share))); } public static void toggleFullScreen() { @@ -1140,7 +1141,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { case KeyEvent.KEYCODE_ENTER: InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0); - searchTheWeb(getUrl.getText().toString(), CONTEXT); + searchTheWeb(getUrl.getText().toString(), mContext); return true; default: break; @@ -1162,7 +1163,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { || (arg2.getAction() == KeyEvent.KEYCODE_ENTER)) { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0); - searchTheWeb(getUrl.getText().toString(), CONTEXT); + searchTheWeb(getUrl.getText().toString(), mContext); return true; } return false; @@ -1192,7 +1193,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { switch (msg.what) { case 1: { - SimpleAdapter adapter = new SimpleAdapter(CONTEXT, list, + SimpleAdapter adapter = new SimpleAdapter(mContext, list, R.layout.two_line_autocomplete, new String[] { "title", "url" }, new int[] { R.id.title, R.id.url }); @@ -1304,7 +1305,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { url = ((TextView) arg1.findViewById(R.id.url)).getText() .toString(); getUrl.setText(url); - searchTheWeb(url, CONTEXT); + searchTheWeb(url, mContext); url = null; getUrl.setPadding(tenPad, 0, tenPad, 0); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -1487,7 +1488,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { getWindowManager().getDefaultDisplay().getMetrics(metrics); historyHandler = new DatabaseHandler(this); cookieManager = CookieManager.getInstance(); - CookieSyncManager.createInstance(CONTEXT); + CookieSyncManager.createInstance(mContext); cookieManager.setAcceptCookie(settings.getBoolean("cookies", true)); progressBar = (ProgressBar) findViewById(R.id.progressBar1); @@ -1554,7 +1555,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { // user agent if (API < 17) { - user = new WebView(CONTEXT).getSettings().getUserAgentString(); + user = new WebView(mContext).getSettings().getUserAgentString(); } else { user = WebSettings.getDefaultUserAgent(this); } @@ -1761,7 +1762,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); // displays main xml layout - CONTEXT = this; + mContext = this; ACTIVITY = this; settings = getSharedPreferences("settings", 0); edit = settings.edit(); @@ -1778,7 +1779,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { } try { - LocationManager locationManager = (LocationManager) CONTEXT + LocationManager locationManager = (LocationManager) mContext .getSystemService(Context.LOCATION_SERVICE); if (locationManager.getAllProviders().contains( LocationManager.GPS_PROVIDER)) { @@ -1821,7 +1822,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { + "4. Visit settings and advanced settings to change options\n\n" + "5. Long-press on the new tab button to open the last closed tab"; - Utils.createInformativeDialog(CONTEXT, "Browser Tips", message); + Utils.createInformativeDialog(mContext, "Browser Tips", message); edit.putInt("first", 1); edit.putInt("version", code); edit.commit(); @@ -1937,7 +1938,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { if (id >= 0) { main[id].loadUrl(url); } else if (download == 1) { - Utils.downloadFile(CONTEXT, url, null, null); + Utils.downloadFile(mContext, url, null, null); } else if (url != null) { newTab(url, true); } @@ -1950,12 +1951,12 @@ public class BrowserActivity extends Activity implements OnTouchListener { switch (item.getItemId()) { case R.id.history: - generateHistory(currentTab, CONTEXT); + generateHistory(currentTab, mContext); return true; case R.id.bookmark: if (urlToLoad[currentId][1] != null) { if (!urlToLoad[currentId][1].equals("Bookmarks")) { - Utils.addBookmark(CONTEXT, urlToLoad[currentId][1], + Utils.addBookmark(mContext, urlToLoad[currentId][1], urlToLoad[currentId][0]); } } @@ -1965,9 +1966,9 @@ public class BrowserActivity extends Activity implements OnTouchListener { return true; case R.id.allBookmarks: if (urlToLoad[currentId][1] == null) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } else if (!urlToLoad[currentId][1].equals("Bookmarks")) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } return true; @@ -2046,7 +2047,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { private boolean xPress; private Rect edge; private final GestureDetector mGestureDetector = new GestureDetector( - CONTEXT, new CustomGestureListener()); + mContext, new CustomGestureListener()); private class CustomGestureListener extends SimpleOnGestureListener { @Override @@ -2157,7 +2158,7 @@ public class BrowserActivity extends Activity implements OnTouchListener { public void onClick(View v) { if (API >= 11) { - PopupMenu menu = new PopupMenu(CONTEXT, v); + PopupMenu menu = new PopupMenu(mContext, v); MenuInflater inflate = menu.getMenuInflater(); inflate.inflate(R.menu.menu, menu.getMenu()); menu.setOnMenuItemClickListener(new OnMenuItemClickListener() { @@ -2167,13 +2168,13 @@ public class BrowserActivity extends Activity implements OnTouchListener { switch (item.getItemId()) { case R.id.history: - generateHistory(currentTab, CONTEXT); + generateHistory(currentTab, mContext); return true; case R.id.bookmark: if (urlToLoad[currentId][1] != null) { if (!urlToLoad[currentId][1] .equals("Bookmarks")) { - Utils.addBookmark(CONTEXT, + Utils.addBookmark(mContext, urlToLoad[currentId][1], urlToLoad[currentId][0]); } @@ -2184,10 +2185,10 @@ public class BrowserActivity extends Activity implements OnTouchListener { return true; case R.id.allBookmarks: if (urlToLoad[currentId][1] == null) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } else if (!urlToLoad[currentId][1] .equals("Bookmarks")) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } return true; case R.id.share: diff --git a/src/acr/browser/barebones/activities/IncognitoModeActivity.java b/src/acr/browser/barebones/activities/IncognitoModeActivity.java index 131f3b8..84ad9d7 100644 --- a/src/acr/browser/barebones/activities/IncognitoModeActivity.java +++ b/src/acr/browser/barebones/activities/IncognitoModeActivity.java @@ -163,7 +163,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { public static final int API = FinalVariables.API; public static final String SEPARATOR = "\\|\\$\\|SEPARATOR\\|\\$\\|"; // semi constants - public static Context CONTEXT; + public static Context mContext; public static String SEARCH; public static List tabList; @@ -242,8 +242,8 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { currentTabTitle.setPadding(leftPad, 0, rightPad, 0); } } - final TextView title = new TextView(CONTEXT); - title.setText("New Tab"); + final TextView title = new TextView(mContext); + title.setText(mContext.getResources().getString(R.string.action_new_tab)); if (display) { if (API < 16) { title.setBackgroundDrawable(active); @@ -270,7 +270,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { Drawable[] drawables = title.getCompoundDrawables(); bounds = drawables[2].getBounds(); title.setOnTouchListener(ACTIVITY); - Animation holo = AnimationUtils.loadAnimation(CONTEXT, R.anim.up); + Animation holo = AnimationUtils.loadAnimation(mContext, R.anim.up); tabLayout.addView(title); title.setVisibility(View.INVISIBLE); holo.setAnimationListener(new AnimationListener() { @@ -292,7 +292,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { title.startAnimation(holo); urlTitle[id] = title; - urlTitle[id].setText("New Tab"); + urlTitle[id].setText(mContext.getResources().getString(R.string.action_new_tab)); if (theUrl != null) { main[id] = generateTab(id, theUrl, display); @@ -301,14 +301,14 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { } } else { - Utils.showToast(CONTEXT, "Max number of tabs reached"); + Utils.showToast(mContext, "Max number of tabs reached"); } return id; } public static void deleteBookmark(String url) { - File book = new File(CONTEXT.getFilesDir(), "bookmarks"); - File bookUrl = new File(CONTEXT.getFilesDir(), "bookurl"); + File book = new File(mContext.getFilesDir(), "bookmarks"); + File bookUrl = new File(mContext.getFilesDir(), "bookurl"); int n = 0; try { BufferedWriter bookWriter = new BufferedWriter(new FileWriter(book)); @@ -347,7 +347,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { readUrl.close(); } catch (IOException ignored) { } - openBookmarks(CONTEXT, currentTab); + openBookmarks(mContext, currentTab); } public static void generateHistory(final IncognitoWebView view, @@ -431,7 +431,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { public static IncognitoWebView generateTab(final int pageToView, String Url, final boolean display) { - IncognitoWebView view = new IncognitoWebView(CONTEXT); + IncognitoWebView view = new IncognitoWebView(mContext); view.setId(pageToView); view.setWebViewClient(new IncognitoWebViewClient(ACTIVITY)); view.setWebChromeClient(new IncognitoChromeClient(ACTIVITY)); @@ -451,7 +451,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { } uBar.bringToFront(); if (Url.contains("about:home")) { - goBookmarks(CONTEXT, view); + goBookmarks(mContext, view); } else if (Url.contains("about:blank")) { view.loadUrl(""); } else { @@ -465,7 +465,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { if (view.isShown() && view.canGoBack()) { view.goBack(); } - Animation left = AnimationUtils.loadAnimation(CONTEXT, R.anim.left); + Animation left = AnimationUtils.loadAnimation(mContext, R.anim.left); background.startAnimation(left); } @@ -497,7 +497,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { if (view.isShown() && view.canGoForward()) { view.goForward(); } - Animation right = AnimationUtils.loadAnimation(CONTEXT, R.anim.right); + Animation right = AnimationUtils.loadAnimation(mContext, R.anim.right); background.startAnimation(right); } @@ -525,11 +525,11 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { } }; - AlertDialog.Builder builder = new AlertDialog.Builder(CONTEXT); // dialog - builder.setMessage("What would you like to do with this bookmark?") - .setPositiveButton("Rename", dialogClickListener) - .setNegativeButton("Open", dialogClickListener) - .setNeutralButton("Delete", dialogClickListener).show(); + AlertDialog.Builder builder = new AlertDialog.Builder(mContext); // dialog + builder.setMessage(mContext.getResources().getString(R.string.dialog_bookmark)) + .setPositiveButton(mContext.getResources().getString(R.string.action_edit), dialogClickListener) + .setNegativeButton(mContext.getResources().getString(R.string.action_open), dialogClickListener) + .setNeutralButton(mContext.getResources().getString(R.string.action_delete), dialogClickListener).show(); } } @@ -585,7 +585,8 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { FrameLayout screen = (FrameLayout) ACTIVITY.getWindow().getDecorView(); screen.removeView(fullScreenContainer); fullScreenContainer = null; - mCustomViewCallback.onCustomViewHidden(); + //causing video crashes + //mCustomViewCallback.onCustomViewHidden(); ACTIVITY.setRequestedOrientation(orientation); background.addView(currentTab); uBar.setVisibility(View.VISIBLE); @@ -602,7 +603,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { final HitTestResult result = currentTab.getHitTestResult(); if (currentTab.getUrl().contains( - "file://" + CONTEXT.getFilesDir() + "/bookmarks.html")) { + "file://" + mContext.getFilesDir() + "/bookmarks.html")) { click = new Message(); click.arg1 = n; click.setTarget(new ClickHandler()); @@ -633,7 +634,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { if (API > 8) { String url = result.getExtra(); - Utils.downloadFile(CONTEXT, url, null, null); + Utils.downloadFile(mContext, url, null, null); } break; @@ -643,14 +644,14 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { }; AlertDialog.Builder builder = new AlertDialog.Builder( - CONTEXT); // dialog + mContext); // dialog builder.setMessage( - "What would you like to do with this image?") - .setPositiveButton("Open in New Tab", + mContext.getResources().getString(R.string.dialog_image)) + .setPositiveButton(mContext.getResources().getString(R.string.action_new_tab), dialogClickListener) - .setNegativeButton("Open Normally", + .setNegativeButton(mContext.getResources().getString(R.string.action_open), dialogClickListener) - .setNeutralButton("Download Image", + .setNeutralButton(mContext.getResources().getString(R.string.action_download), dialogClickListener).show(); } else { @@ -689,15 +690,15 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { }; AlertDialog.Builder builder = new AlertDialog.Builder( - CONTEXT); // dialog + mContext); // dialog builder.setTitle(result.getExtra()) .setMessage( - "What do you want to do with this link?") - .setPositiveButton("Open in New Tab", + mContext.getResources().getString(R.string.dialog_link)) + .setPositiveButton(mContext.getResources().getString(R.string.action_new_tab), dialogClickListener) - .setNegativeButton("Open Normally", + .setNegativeButton(mContext.getResources().getString(R.string.action_open), dialogClickListener) - .setNeutralButton("Copy link", dialogClickListener) + .setNeutralButton(mContext.getResources().getString(R.string.action_copy), dialogClickListener) .show(); } } @@ -825,7 +826,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { public static void reinitializeSettings() { int size = tabList.size(); for (int n = 0; n < size; n++) { - main[tabList.get(n)].settingsInitialization(CONTEXT); + main[tabList.get(n)].settingsInitialization(mContext); } } @@ -840,20 +841,20 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { } } - final AlertDialog.Builder homePicker = new AlertDialog.Builder(CONTEXT); - homePicker.setTitle("Rename Bookmark"); - final EditText getText = new EditText(CONTEXT); + final AlertDialog.Builder homePicker = new AlertDialog.Builder(mContext); + homePicker.setTitle(mContext.getResources().getString(R.string.title_edit_bookmark)); + final EditText getText = new EditText(mContext); getText.setText(bTitle[index]); homePicker.setView(getText); - homePicker.setPositiveButton("OK", + homePicker.setPositiveButton(mContext.getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { bTitle[index] = getText.getText().toString(); - File book = new File(CONTEXT.getFilesDir(), "bookmarks"); - File bookUrl = new File(CONTEXT.getFilesDir(), + File book = new File(mContext.getFilesDir(), "bookmarks"); + File bookUrl = new File(mContext.getFilesDir(), "bookurl"); int n = 0; try { @@ -895,7 +896,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { readUrl.close(); } catch (IOException ignored) { } - openBookmarks(CONTEXT, currentTab); + openBookmarks(mContext, currentTab); } }); homePicker.show(); @@ -975,8 +976,8 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { shareIntent.putExtra(android.content.Intent.EXTRA_TEXT, shareMessage); // start the chooser for sharing - CONTEXT.startActivity(Intent.createChooser(shareIntent, - "Share this page")); + mContext.startActivity(Intent.createChooser(shareIntent, + mContext.getResources().getString(R.string.dialog_title_share))); } public static void toggleFullScreen() { @@ -1095,7 +1096,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { case KeyEvent.KEYCODE_ENTER: InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0); - searchTheWeb(getUrl.getText().toString(), CONTEXT); + searchTheWeb(getUrl.getText().toString(), mContext); return true; default: break; @@ -1117,7 +1118,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { || (arg2.getAction() == KeyEvent.KEYCODE_ENTER)) { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0); - searchTheWeb(getUrl.getText().toString(), CONTEXT); + searchTheWeb(getUrl.getText().toString(), mContext); return true; } return false; @@ -1128,8 +1129,8 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { static List> getBookmarks() { List> bookmarks = new ArrayList>(); - File bookUrl = new File(CONTEXT.getFilesDir(), "bookurl"); - File book = new File(CONTEXT.getFilesDir(), "bookmarks"); + File bookUrl = new File(mContext.getFilesDir(), "bookurl"); + File book = new File(mContext.getFilesDir(), "bookmarks"); try { BufferedReader readUrl = new BufferedReader(new FileReader(bookUrl)); BufferedReader readBook = new BufferedReader(new FileReader(book)); @@ -1170,7 +1171,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { switch (msg.what) { case 1: { - SimpleAdapter adapter = new SimpleAdapter(CONTEXT, list, + SimpleAdapter adapter = new SimpleAdapter(mContext, list, R.layout.two_line_autocomplete, new String[] { "title", "url" }, new int[] { R.id.title, R.id.url }); @@ -1282,7 +1283,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { url = ((TextView) arg1.findViewById(R.id.url)).getText() .toString(); getUrl.setText(url); - searchTheWeb(url, CONTEXT); + searchTheWeb(url, mContext); url = null; getUrl.setPadding(tenPad, 0, tenPad, 0); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -1458,7 +1459,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { getWindowManager().getDefaultDisplay().getMetrics(metrics); historyHandler = new DatabaseHandler(this); cookieManager = CookieManager.getInstance(); - CookieSyncManager.createInstance(CONTEXT); + CookieSyncManager.createInstance(mContext); cookieManager.setAcceptCookie(false); progressBar = (ProgressBar) findViewById(R.id.progressBar1); @@ -1525,7 +1526,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { // user agent if (API < 17) { - user = new WebView(CONTEXT).getSettings().getUserAgentString(); + user = new WebView(mContext).getSettings().getUserAgentString(); } else { user = WebSettings.getDefaultUserAgent(this); } @@ -1728,7 +1729,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); // displays main xml layout - CONTEXT = this; + mContext = this; ACTIVITY = this; settings = getSharedPreferences("settings", 0); edit = settings.edit(); @@ -1760,7 +1761,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { + "disabled to ensure as best we can that you are not being tracked. " + "Happy Browsing!"; - Utils.createInformativeDialog(CONTEXT, "About Incognito", message); + Utils.createInformativeDialog(mContext, "About Incognito", message); edit.putInt("first", 1); edit.commit(); } @@ -1872,7 +1873,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { if (id >= 0) { main[id].loadUrl(url); } else if (download == 1) { - Utils.downloadFile(CONTEXT, url, null, null); + Utils.downloadFile(mContext, url, null, null); } else if (url != null) { newTab(url, true); } @@ -1885,12 +1886,12 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { switch (item.getItemId()) { case R.id.history: - generateHistory(currentTab, CONTEXT); + generateHistory(currentTab, mContext); return true; case R.id.bookmark: if (urlToLoad[currentId][1] != null) { if (!urlToLoad[currentId][1].equals("Bookmarks")) { - Utils.addBookmark(CONTEXT, urlToLoad[currentId][1], + Utils.addBookmark(mContext, urlToLoad[currentId][1], urlToLoad[currentId][0]); } } @@ -1900,9 +1901,9 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { return true; case R.id.allBookmarks: if (urlToLoad[currentId][1] == null) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } else if (!urlToLoad[currentId][1].equals("Bookmarks")) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } return true; @@ -1958,7 +1959,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { private Rect edge; private boolean xPress; private final GestureDetector mGestureDetector = new GestureDetector( - CONTEXT, new CustomGestureListener()); + mContext, new CustomGestureListener()); private class CustomGestureListener extends SimpleOnGestureListener { @Override @@ -2070,7 +2071,7 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { public void onClick(View v) { if (API >= 11) { - PopupMenu menu = new PopupMenu(CONTEXT, v); + PopupMenu menu = new PopupMenu(mContext, v); MenuInflater inflate = menu.getMenuInflater(); inflate.inflate(R.menu.incognito_menu, menu.getMenu()); menu.setOnMenuItemClickListener(new OnMenuItemClickListener() { @@ -2080,13 +2081,13 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { switch (item.getItemId()) { case R.id.history: - generateHistory(currentTab, CONTEXT); + generateHistory(currentTab, mContext); return true; case R.id.bookmark: if (urlToLoad[currentId][1] != null) { if (!urlToLoad[currentId][1] .equals("Bookmarks")) { - Utils.addBookmark(CONTEXT, + Utils.addBookmark(mContext, urlToLoad[currentId][1], urlToLoad[currentId][0]); } @@ -2097,10 +2098,10 @@ public class IncognitoModeActivity extends Activity implements OnTouchListener { return true; case R.id.allBookmarks: if (urlToLoad[currentId][1] == null) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } else if (!urlToLoad[currentId][1] .equals("Bookmarks")) { - goBookmarks(CONTEXT, currentTab); + goBookmarks(mContext, currentTab); } return true; case R.id.share: diff --git a/src/acr/browser/barebones/activities/SettingsActivity.java b/src/acr/browser/barebones/activities/SettingsActivity.java index 79259a8..9a2c1d5 100644 --- a/src/acr/browser/barebones/activities/SettingsActivity.java +++ b/src/acr/browser/barebones/activities/SettingsActivity.java @@ -35,7 +35,7 @@ import android.widget.TextView; public class SettingsActivity extends Activity { static int API = FinalVariables.API; static final String preferences = "settings"; - static SharedPreferences.Editor edit; + static SharedPreferences.Editor mEditPrefs; static int agentChoice; static String homepage; static TextView agentText; @@ -63,7 +63,7 @@ public class SettingsActivity extends Activity { getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); } - edit = settings.edit(); + mEditPrefs= settings.edit(); // initialize UI RelativeLayout layoutLocation = (RelativeLayout) findViewById(R.id.layoutLocation); @@ -131,29 +131,27 @@ public class SettingsActivity extends Activity { version.setText(code + ""); if (homepage.contains("about:home")) { - homepageText.setText("Bookmarks"); + homepageText.setText(getResources().getString( + R.string.action_homepage)); } else if (homepage.contains("about:blank")) { - homepageText.setText("Blank Page"); + homepageText.setText(getResources() + .getString(R.string.action_blank)); } else { homepageText.setText(homepage); } switch (agentChoice) { case 1: - agentText.setText("Default"); - agent = BrowserActivity.defaultUser; + agentText.setText(getResources().getString(R.string.agent_default)); break; case 2: - agentText.setText("Desktop"); - agent = FinalVariables.DESKTOP_USER_AGENT; + agentText.setText(getResources().getString(R.string.agent_desktop)); break; case 3: - agentText.setText("Mobile"); - agent = FinalVariables.MOBILE_USER_AGENT; + agentText.setText(getResources().getString(R.string.agent_mobile)); break; case 4: - agentText.setText("Custom"); - agent = settings.getString("userAgentString", BrowserActivity.defaultUser); + agentText.setText(getResources().getString(R.string.agent_custom)); } RelativeLayout r1, r2, r3; r1 = (RelativeLayout) findViewById(R.id.setR1); @@ -226,7 +224,8 @@ public class SettingsActivity extends Activity { public void onClick(View v) { AlertDialog.Builder picker = new AlertDialog.Builder( SettingsActivity.this); - picker.setTitle("Search Engine"); + picker.setTitle(getResources().getString( + R.string.title_search_engine)); CharSequence[] chars = { "Google", "Bing", "Yahoo", "StartPage", "DuckDuckGo (Privacy)" , "Baidu (Chinese)", "Yandex (Russian)", "DuckDuckGo Lite (Privacy)"}; @@ -238,8 +237,8 @@ public class SettingsActivity extends Activity { @Override public void onClick(DialogInterface dialog, int which) { - edit.putInt("search", which + 1); - edit.commit(); + mEditPrefs.putInt("search", which + 1); + mEditPrefs.commit(); switch (which + 1) { case 1: searchText.setText("Google"); @@ -268,7 +267,7 @@ public class SettingsActivity extends Activity { } } }); - picker.setNeutralButton("OK", + picker.setNeutralButton(getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override @@ -365,8 +364,8 @@ public class SettingsActivity extends Activity { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - edit.putBoolean("location", isChecked); - edit.commit(); + mEditPrefs.putBoolean("location", isChecked); + mEditPrefs.commit(); } @@ -380,8 +379,8 @@ public class SettingsActivity extends Activity { if (isChecked) { n = 1; } - edit.putInt("enableflash", n); - edit.commit(); + mEditPrefs.putInt("enableflash", n); + mEditPrefs.commit(); boolean flashInstalled = false; try { PackageManager pm = getPackageManager(); @@ -393,19 +392,21 @@ public class SettingsActivity extends Activity { flashInstalled = false; } if (!flashInstalled && isChecked) { - Utils.createInformativeDialog(SettingsActivity.this, - "Warning", "Adobe Flash Player was not detected.\n" - + "Please install Flash Player."); + Utils.createInformativeDialog( + SettingsActivity.this, + getResources().getString(R.string.title_warning), + getResources().getString( + R.string.dialog_adobe_not_installed)); buttonView.setChecked(false); - edit.putInt("enableflash", 0); - edit.commit(); + mEditPrefs.putInt("enableflash", 0); + mEditPrefs.commit(); - } else if ((API > 17) && isChecked) { + } else if ((API >= 17) && isChecked) { Utils.createInformativeDialog( SettingsActivity.this, - "Warning", - "Adobe Flash does not support Android 4.3 and will " - + "crash the browser, please do not report crashes that occur if you enable flash."); + getResources().getString(R.string.title_warning), + getResources().getString( + R.string.dialog_adobe_unsupported)); } } @@ -415,8 +416,8 @@ public class SettingsActivity extends Activity { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - edit.putBoolean("fullscreen", isChecked); - edit.commit(); + mEditPrefs.putBoolean("fullscreen", isChecked); + mEditPrefs.commit(); } @@ -430,8 +431,8 @@ public class SettingsActivity extends Activity { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - edit.putBoolean("location", isChecked); - edit.commit(); + mEditPrefs.putBoolean("location", isChecked); + mEditPrefs.commit(); } @@ -445,8 +446,8 @@ public class SettingsActivity extends Activity { if (isChecked) { n = 1; } - edit.putInt("enableflash", n); - edit.commit(); + mEditPrefs.putInt("enableflash", n); + mEditPrefs.commit(); boolean flashInstalled = false; try { PackageManager pm = getPackageManager(); @@ -458,19 +459,21 @@ public class SettingsActivity extends Activity { flashInstalled = false; } if (!flashInstalled && isChecked) { - Utils.createInformativeDialog(SettingsActivity.this, - "Warning", "Adobe Flash Player was not detected.\n" - + "Please install Flash Player."); + Utils.createInformativeDialog( + SettingsActivity.this, + getResources().getString(R.string.title_warning), + getResources().getString( + R.string.dialog_adobe_not_installed)); buttonView.setChecked(false); - edit.putInt("enableflash", 0); - edit.commit(); + mEditPrefs.putInt("enableflash", 0); + mEditPrefs.commit(); } else if ((API > 17) && isChecked) { Utils.createInformativeDialog( SettingsActivity.this, - "Warning", - "Adobe Flash does not support Android 4.3 and will " - + "crash the browser, please do not report crashes that occur if you enable flash."); + getResources().getString(R.string.title_warning), + getResources().getString( + R.string.dialog_adobe_unsupported)); } } @@ -480,8 +483,8 @@ public class SettingsActivity extends Activity { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - edit.putBoolean("fullscreen", isChecked); - edit.commit(); + mEditPrefs.putBoolean("fullscreen", isChecked); + mEditPrefs.commit(); } @@ -506,8 +509,13 @@ public class SettingsActivity extends Activity { public void onClick(View v) { AlertDialog.Builder agentPicker = new AlertDialog.Builder( SettingsActivity.this); - agentPicker.setTitle("User Agent"); - CharSequence[] chars = { "Default", "Desktop", "Mobile" }; + agentPicker.setTitle(getResources().getString( + R.string.title_user_agent)); + CharSequence[] chars = { + getResources().getString(R.string.agent_default), + getResources().getString(R.string.agent_desktop), + getResources().getString(R.string.agent_mobile), + getResources().getString(R.string.agent_custom) }; agentChoice = settings.getInt("agentchoose", 1); agentPicker.setSingleChoiceItems(chars, agentChoice - 1, new DialogInterface.OnClickListener() { @@ -515,30 +523,31 @@ public class SettingsActivity extends Activity { @Override public void onClick(DialogInterface dialog, int which) { - edit.putInt("agentchoose", which + 1); - edit.commit(); + mEditPrefs.putInt("agentchoose", which + 1); + mEditPrefs.commit(); switch (which + 1) { case 1: - agentText.setText("Default"); - agent = BrowserActivity.defaultUser; + agentText.setText(getResources().getString( + R.string.agent_default)); break; case 2: - agentText.setText("Desktop"); - agent = FinalVariables.DESKTOP_USER_AGENT; + agentText.setText(getResources().getString( + R.string.agent_desktop)); break; case 3: - agentText.setText("Mobile"); - agent = FinalVariables.MOBILE_USER_AGENT; + agentText.setText(getResources().getString( + R.string.agent_mobile)); break; case 4: - agentText.setText("Custom"); - agent = settings.getString("userAgentString", BrowserActivity.defaultUser); + agentText.setText(getResources().getString( + R.string.agent_custom)); agentPicker(); break; } } }); - agentPicker.setNeutralButton("OK", + agentPicker.setNeutralButton( + getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override @@ -569,18 +578,21 @@ public class SettingsActivity extends Activity { final AlertDialog.Builder agentStringPicker = new AlertDialog.Builder( SettingsActivity.this); - agentStringPicker.setTitle("Custom Agent"); + agentStringPicker.setTitle(getResources().getString( + R.string.title_user_agent)); final EditText getAgent = new EditText(SettingsActivity.this); agentStringPicker.setView(getAgent); - agentStringPicker.setPositiveButton("OK", + agentStringPicker.setPositiveButton( + getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { String text = getAgent.getText().toString(); - edit.putString("userAgentString", text); - edit.commit(); - agentText.setText("Custom"); + mEditPrefs.putString("userAgentString", text); + mEditPrefs.commit(); + agentText.setText(getResources().getString( + R.string.agent_custom)); } }); agentStringPicker.show(); @@ -594,8 +606,11 @@ public class SettingsActivity extends Activity { AlertDialog.Builder picker = new AlertDialog.Builder( SettingsActivity.this); - picker.setTitle("Download Location"); - CharSequence[] chars = { "Default", "Custom" }; + picker.setTitle(getResources().getString( + R.string.title_download_location)); + CharSequence[] chars = { + getResources().getString(R.string.agent_default), + getResources().getString(R.string.agent_custom) }; downloadLocation = settings.getString("download", Environment.DIRECTORY_DOWNLOADS); int n = -1; @@ -614,9 +629,9 @@ public class SettingsActivity extends Activity { switch (which + 1) { case 1: - edit.putString("download", + mEditPrefs.putString("download", Environment.DIRECTORY_DOWNLOADS); - edit.commit(); + mEditPrefs.commit(); download.setText(FinalVariables.EXTERNAL_STORAGE + "/" + Environment.DIRECTORY_DOWNLOADS); @@ -628,7 +643,8 @@ public class SettingsActivity extends Activity { } } }); - picker.setNeutralButton("OK", + picker.setNeutralButton( + getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override @@ -645,8 +661,9 @@ public class SettingsActivity extends Activity { public void homePicker() { final AlertDialog.Builder homePicker = new AlertDialog.Builder( - SettingsActivity.this); - homePicker.setTitle("Custom Homepage"); + this); + homePicker.setTitle(getResources().getString( + R.string.title_custom_homepage)); final EditText getHome = new EditText(SettingsActivity.this); homepage = settings.getString("home", FinalVariables.HOMEPAGE); if (!homepage.startsWith("about:")) { @@ -655,14 +672,14 @@ public class SettingsActivity extends Activity { getHome.setText("http://www.google.com"); } homePicker.setView(getHome); - homePicker.setPositiveButton("OK", + homePicker.setPositiveButton(getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { String text = getHome.getText().toString(); - edit.putString("home", text); - edit.commit(); + mEditPrefs.putString("home", text); + mEditPrefs.commit(); homepageText.setText(text); } }); @@ -672,14 +689,15 @@ public class SettingsActivity extends Activity { @SuppressWarnings("deprecation") public void downPicker() { final AlertDialog.Builder downLocationPicker = new AlertDialog.Builder( - SettingsActivity.this); + this); LinearLayout layout = new LinearLayout(this); - downLocationPicker.setTitle("Custom Location"); + downLocationPicker.setTitle(getResources().getString( + R.string.title_download_location)); final EditText getDownload = new EditText(SettingsActivity.this); getDownload.setBackgroundResource(0); downloadLocation = settings.getString("download", Environment.DIRECTORY_DOWNLOADS); - int padding = Utils.convertDensityPixesl(this, 10); + int padding = Utils.convertDensityPixels(this, 10); LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, @@ -705,14 +723,15 @@ public class SettingsActivity extends Activity { android.R.drawable.edit_text)); } downLocationPicker.setView(layout); - downLocationPicker.setPositiveButton("OK", + downLocationPicker.setPositiveButton( + getResources().getString(R.string.action_ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { String text = getDownload.getText().toString(); - edit.putString("download", text); - edit.commit(); + mEditPrefs.putString("download", text); + mEditPrefs.commit(); download.setText(FinalVariables.EXTERNAL_STORAGE + "/" + text); } @@ -748,13 +767,13 @@ public class SettingsActivity extends Activity { switch (which + 1) { case 1: - edit.putString("home", "about:home"); - edit.commit(); + mEditPrefs.putString("home", "about:home"); + mEditPrefs.commit(); homepageText.setText("Bookmarks"); break; case 2: - edit.putString("home", "about:blank"); - edit.commit(); + mEditPrefs.putString("home", "about:blank"); + mEditPrefs.commit(); homepageText.setText("Blank Page"); break; case 3: diff --git a/src/acr/browser/barebones/utilities/Utils.java b/src/acr/browser/barebones/utilities/Utils.java index d99e6f3..9e08cd6 100644 --- a/src/acr/browser/barebones/utilities/Utils.java +++ b/src/acr/browser/barebones/utilities/Utils.java @@ -189,7 +189,7 @@ public class Utils { return intent; } - public static int convertDensityPixesl(Context context, int densityPixels) { + public static int convertDensityPixels(Context context, int densityPixels) { float scale = context.getResources().getDisplayMetrics().density; int pixels = (int) (densityPixels * scale + 0.5f); return pixels; diff --git a/src/acr/browser/barebones/webviewclasses/CustomDownloadListener.java b/src/acr/browser/barebones/webviewclasses/CustomDownloadListener.java index e961d22..d9e7436 100644 --- a/src/acr/browser/barebones/webviewclasses/CustomDownloadListener.java +++ b/src/acr/browser/barebones/webviewclasses/CustomDownloadListener.java @@ -1,6 +1,5 @@ package acr.browser.barebones.webviewclasses; -import acr.browser.barebones.activities.BrowserActivity; import acr.browser.barebones.utilities.Utils; import android.app.AlertDialog; import android.content.Context; @@ -10,9 +9,9 @@ import android.net.Uri; import android.webkit.DownloadListener; public class CustomDownloadListener implements DownloadListener { - private static Context context; - public CustomDownloadListener(BrowserActivity activity){ - context = activity; + private static Context mContext; + public CustomDownloadListener(Context context){ + mContext = context; } @@ -22,7 +21,7 @@ public class CustomDownloadListener implements DownloadListener { long contentLength) { if (url.endsWith(".mp4") || url.endsWith(".m4a")) { - AlertDialog.Builder builder = new AlertDialog.Builder(context); + AlertDialog.Builder builder = new AlertDialog.Builder(mContext); builder.setTitle("Open as..."); builder.setMessage( "Do you want to download this video or watch it in an app?") @@ -32,7 +31,7 @@ public class CustomDownloadListener implements DownloadListener { @Override public void onClick(DialogInterface dialog, int id) { - Utils.downloadFile(context, url, + Utils.downloadFile(mContext, url, contentDisposition, mimetype); } }) @@ -48,14 +47,14 @@ public class CustomDownloadListener implements DownloadListener { intent.putExtra( "acr.browser.barebones.Download", 1); - context.startActivity(intent); + mContext.startActivity(intent); } }); AlertDialog alert = builder.create(); alert.show(); } else { - Utils.downloadFile(context, url, contentDisposition, mimetype); + Utils.downloadFile(mContext, url, contentDisposition, mimetype); } }