diff options
author | Matt A. Tobin <email@mattatobin.com> | 2019-04-23 15:32:23 -0400 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-23 15:32:23 -0400 |
commit | abe80cc31d5a40ebed743085011fbcda0c1a9a10 (patch) | |
tree | fb3762f06b84745b182af281abb107b95a9fcf01 /mobile/android/bouncer/java | |
parent | 63295d0087eb58a6eb34cad324c4c53d1b220491 (diff) | |
download | UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.gz UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.lz UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.xz UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.zip |
Issue #1053 - Drop support Android and remove Fennec - Part 1a: Remove mobile/android
Diffstat (limited to 'mobile/android/bouncer/java')
-rw-r--r-- | mobile/android/bouncer/java/org/mozilla/bouncer/BouncerService.java | 129 | ||||
-rw-r--r-- | mobile/android/bouncer/java/org/mozilla/gecko/BrowserApp.java | 46 |
2 files changed, 0 insertions, 175 deletions
diff --git a/mobile/android/bouncer/java/org/mozilla/bouncer/BouncerService.java b/mobile/android/bouncer/java/org/mozilla/bouncer/BouncerService.java deleted file mode 100644 index b33d1a9ca..000000000 --- a/mobile/android/bouncer/java/org/mozilla/bouncer/BouncerService.java +++ /dev/null @@ -1,129 +0,0 @@ -/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.bouncer; - -import android.app.IntentService; -import android.content.Intent; -import android.util.Log; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.List; - -public class BouncerService extends IntentService { - - private static final String LOGTAG = "GeckoBouncerService"; - - public BouncerService() { - super("BouncerService"); - } - - @Override - protected void onHandleIntent(Intent intent) { - final byte[] buffer = new byte[8192]; - - Log.d(LOGTAG, "Preparing to copy distribution files"); - - final List<String> files; - try { - files = getFiles("distribution"); - } catch (IOException e) { - Log.e(LOGTAG, "Error getting distribution files from assets/distribution/**", e); - return; - } - - InputStream in = null; - for (String path : files) { - try { - Log.d(LOGTAG, "Copying distribution file: " + path); - - in = getAssets().open(path); - - final File outFile = getDataFile(path); - writeStream(in, outFile, buffer); - } catch (IOException e) { - Log.e(LOGTAG, "Error opening distribution input stream from assets", e); - } finally { - if (in != null) { - try { - in.close(); - } catch (IOException e) { - Log.e(LOGTAG, "Error closing distribution input stream", e); - } - } - } - } - } - - /** - * Recursively traverse a directory to list paths to all files. - * - * @param path Directory to traverse. - * @return List of all files in given directory. - * @throws IOException - */ - private List<String> getFiles(String path) throws IOException { - List<String> paths = new ArrayList<>(); - getFiles(path, paths); - return paths; - } - - /** - * Recursively traverse a directory to list paths to all files. - * - * @param path Directory to traverse. - * @param acc Accumulator of paths seen. - * @throws IOException - */ - private void getFiles(String path, List<String> acc) throws IOException { - final String[] list = getAssets().list(path); - if (list.length > 0) { - // We're a directory -- recurse. - for (final String file : list) { - getFiles(path + "/" + file, acc); - } - } else { - // We're a file -- accumulate. - acc.add(path); - } - } - - private String getDataDir() { - return getApplicationInfo().dataDir; - } - - private File getDataFile(final String path) { - File outFile = new File(getDataDir(), path); - File dir = outFile.getParentFile(); - - if (dir != null && !dir.exists()) { - Log.d(LOGTAG, "Creating " + dir.getAbsolutePath()); - if (!dir.mkdirs()) { - Log.e(LOGTAG, "Unable to create directories: " + dir.getAbsolutePath()); - return null; - } - } - - return outFile; - } - - private void writeStream(InputStream fileStream, File outFile, byte[] buffer) - throws IOException { - final OutputStream outStream = new FileOutputStream(outFile); - try { - int count; - while ((count = fileStream.read(buffer)) > 0) { - outStream.write(buffer, 0, count); - } - } finally { - outStream.close(); - } - } -} diff --git a/mobile/android/bouncer/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/bouncer/java/org/mozilla/gecko/BrowserApp.java deleted file mode 100644 index 8a462822f..000000000 --- a/mobile/android/bouncer/java/org/mozilla/gecko/BrowserApp.java +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.gecko; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.util.Log; - -import org.mozilla.bouncer.BouncerService; - -/** - * Bouncer activity version of BrowserApp. - * - * This class has the same name as org.mozilla.gecko.BrowserApp to preserve - * shortcuts created by the bouncer app. - */ -public class BrowserApp extends Activity { - private static final String LOGTAG = "GeckoBouncerActivity"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // This races distribution installation against the Play Store killing our process to - // install the update. We'll live with it. To do better, consider using an Intent to - // notify when the service has completed. - startService(new Intent(this, BouncerService.class)); - - final String appPackageName = Uri.encode(getPackageName()); - final Uri uri = Uri.parse("market://details?id=" + appPackageName); - Log.i(LOGTAG, "Lanching activity with URL: " + uri.toString()); - - // It might be more correct to catch failure in case the Play Store isn't installed. The - // fallback action is to open the Play Store website... but doing so may offer Firefox as - // browser (since even the bouncer offers to view URLs), which will be very confusing. - // Therefore, we don't try to be fancy here, and we just fail (silently). - startActivity(new Intent(Intent.ACTION_VIEW, uri)); - - finish(); - } -} |