Skip to content

Commit 7885a43

Browse files
committed
Move Google Maps API key to a resource string, check to see if it's empty and crash if so.
1 parent ede59ee commit 7885a43

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<meta-data
4747
android:name="com.google.android.maps.v2.API_KEY"
48-
android:value="YOUR-API-KEY-HERE" />
48+
android:value="@string/google_maps_api_key" />
4949

5050
<meta-data
5151
android:name="com.google.android.gms.version"

app/src/main/java/com/example/mapdemo/MapDemoActivity.java

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
11
package com.example.mapdemo;
22

3-
import android.app.Activity;
4-
import android.app.Dialog;
5-
import android.content.Intent;
6-
import android.content.IntentSender;
7-
import android.location.Location;
8-
import android.os.Bundle;
9-
import android.support.v4.app.DialogFragment;
10-
import android.support.v4.app.FragmentActivity;
11-
import android.support.v7.app.AppCompatActivity;
12-
import android.util.Log;
13-
import android.widget.Toast;
14-
153
import com.google.android.gms.common.ConnectionResult;
164
import com.google.android.gms.common.GooglePlayServicesUtil;
175
import com.google.android.gms.common.api.GoogleApiClient;
18-
import com.google.android.gms.location.LocationListener;
196
import com.google.android.gms.location.LocationRequest;
207
import com.google.android.gms.location.LocationServices;
218
import com.google.android.gms.maps.CameraUpdate;
@@ -25,6 +12,18 @@
2512
import com.google.android.gms.maps.SupportMapFragment;
2613
import com.google.android.gms.maps.model.LatLng;
2714

15+
import android.app.Activity;
16+
import android.app.Dialog;
17+
import android.content.Intent;
18+
import android.content.IntentSender;
19+
import android.location.Location;
20+
import android.os.Bundle;
21+
import android.support.v4.app.DialogFragment;
22+
import android.support.v7.app.AppCompatActivity;
23+
import android.text.TextUtils;
24+
import android.util.Log;
25+
import android.widget.Toast;
26+
2827
import permissions.dispatcher.NeedsPermission;
2928
import permissions.dispatcher.RuntimePermissions;
3029

@@ -52,6 +51,10 @@ protected void onCreate(Bundle savedInstanceState) {
5251
super.onCreate(savedInstanceState);
5352
setContentView(R.layout.map_demo_activity);
5453

54+
if (TextUtils.isEmpty(getResources().getString(R.string.google_maps_api_key))) {
55+
throw new IllegalStateException("You forgot to supply a Google Maps API key");
56+
}
57+
5558
mapFragment = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map));
5659
if (mapFragment != null) {
5760
mapFragment.getMapAsync(new OnMapReadyCallback() {

app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<string name="app_name">Map Demo</string>
55
<string name="hello_world">Hello world!</string>
66
<string name="menu_settings">Settings</string>
7-
7+
<string name="google_maps_api_key"></string>
88
</resources>

0 commit comments

Comments
 (0)